bluetooth fixes from Tomas Vanek

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1571 3c298f89-4303-0410-b956-a3cf2f4a3e73

6 files changed, 61 insertions, 3 deletions

diff --git a/package/bluez-utils/Makefile b/package/bluez-utils/Makefile
index 40ab27980..a31de263c 100644
--- a/package/bluez-utils/Makefile
+++ b/package/bluez-utils/Makefile
@@ -67,6 +67,7 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
+	rm -f $(PKG_INSTALL_DIR)/usr/bin/bluepin
 	touch $@
 
 $(IPKG_BLUEZ_UTILS):
@@ -75,8 +76,9 @@ $(IPKG_BLUEZ_UTILS):
 	install -d -m0755 $(IDIR_BLUEZ_UTILS)/usr/sbin
 	cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/* $(IDIR_BLUEZ_UTILS)/usr/sbin/
 	install -d -m0755 $(IDIR_BLUEZ_UTILS)/etc/bluetooth
-	cp -fp $(PKG_INSTALL_DIR)/../hcid/hcid.conf* $(IDIR_BLUEZ_UTILS)/etc/bluetooth/
-	cp -fp $(PKG_INSTALL_DIR)/../rfcomm/rfcomm.conf* $(IDIR_BLUEZ_UTILS)/etc/bluetooth/
+	cp -fp $(PKG_INSTALL_DIR)/../hcid/hcid.conf $(IDIR_BLUEZ_UTILS)/etc/bluetooth/
+	cp -fp $(PKG_INSTALL_DIR)/../rfcomm/rfcomm.conf $(IDIR_BLUEZ_UTILS)/etc/bluetooth/
+	install -m0700 ./files/givepin $(IDIR_BLUEZ_UTILS)/etc/bluetooth/
 
 	$(RSTRIP) $(IDIR_BLUEZ_UTILS)
 	$(IPKG_BUILD) $(IDIR_BLUEZ_UTILS) $(PACKAGE_DIR)
diff --git a/package/bluez-utils/ipkg/bluez-utils.control b/package/bluez-utils/ipkg/bluez-utils.control
index 7592cbfdd..37726532a 100644
--- a/package/bluez-utils/ipkg/bluez-utils.control
+++ b/package/bluez-utils/ipkg/bluez-utils.control
@@ -3,5 +3,5 @@ Priority: optional
 Section: net
 Maintainer: Markus Becker <mab@comnets.uni-bremen.de>
 Source: http://bluez.org
-Description: Bluez libs
+Description: Bluez utils
 Depends: kmod-bluetooth, bluez-libs
diff --git a/package/bluez-utils/patches/001-include_limits.patch b/package/bluez-utils/patches/001-include_limits.patch
new file mode 100644
index 000000000..6f6cb824b
--- /dev/null
+++ b/package/bluez-utils/patches/001-include_limits.patch
@@ -0,0 +1,22 @@
+diff -ur bluez-utils-2.17.orig/hidd/sdp.c bluez-utils-2.17/hidd/sdp.c
+--- bluez-utils-2.17.orig/hidd/sdp.c	2005-05-09 20:33:24.000000000 +0200
++++ bluez-utils-2.17/hidd/sdp.c	2005-07-26 14:38:13.000000000 +0200
+@@ -39,6 +39,7 @@
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <sys/socket.h>
++#include <linux/limits.h>
+ 
+ #include <bluetooth/bluetooth.h>
+ #include <bluetooth/l2cap.h>
+diff -ur bluez-utils-2.17.orig/tools/hciconfig.c bluez-utils-2.17/tools/hciconfig.c
+--- bluez-utils-2.17.orig/tools/hciconfig.c	2005-05-09 20:33:24.000000000 +0200
++++ bluez-utils-2.17/tools/hciconfig.c	2005-07-26 14:34:29.000000000 +0200
+@@ -40,6 +40,7 @@
+ #include <getopt.h>
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
++#include <linux/limits.h>
+ 
+ #include <bluetooth/bluetooth.h>
+ #include <bluetooth/hci.h>
diff --git a/package/bluez-utils/patches/002-hcid_pin_helper.patch b/package/bluez-utils/patches/002-hcid_pin_helper.patch
new file mode 100644
index 000000000..17a7f3640
--- /dev/null
+++ b/package/bluez-utils/patches/002-hcid_pin_helper.patch
@@ -0,0 +1,21 @@
+diff -ur bluez-utils-2.17.orig/hcid/hcid.conf bluez-utils-2.17/hcid/hcid.conf
+--- bluez-utils-2.17.orig/hcid/hcid.conf	2004-12-25 19:06:00.000000000 +0100
++++ bluez-utils-2.17/hcid/hcid.conf	2005-07-26 14:44:23.000000000 +0200
+@@ -23,7 +23,7 @@
+ 	pairing multi;
+ 
+ 	# PIN helper
+-	pin_helper /usr/bin/bluepin;
++	pin_helper /etc/bluetooth/givepin;
+ 
+ 	# D-Bus PIN helper
+ 	#dbus_pin_helper;
+@@ -34,7 +34,7 @@
+ 	# Local device name
+ 	#   %d - device id
+ 	#   %h - host name
+-	name "BlueZ (%d)";
++	name "OpenWRT";
+ 
+ 	# Local device class
+ 	class 0x3e0100;
diff --git a/target/linux/linux-2.4/Makefile b/target/linux/linux-2.4/Makefile
index 0e4658c2e..00d46933f 100644
--- a/target/linux/linux-2.4/Makefile
+++ b/target/linux/linux-2.4/Makefile
@@ -78,6 +78,7 @@ $(eval $(call KMOD_template,B44,b44,\
 ,CONFIG_B44))
 $(eval $(call KMOD_template,BLUETOOTH,bluetooth,\
 	$(MODULES_DIR)/kernel/net/bluetooth/*.o \
+	$(MODULES_DIR)/kernel/net/bluetooth/rfcomm/*.o \
 	$(MODULES_DIR)/kernel/drivers/bluetooth/*.o \
 ,CONFIG_BLUEZ))
 $(eval $(call KMOD_template,ARPT,arptables,\
diff --git a/target/linux/linux-2.4/patches/brcm/005-bluetooth_sco_buffer_align.patch b/target/linux/linux-2.4/patches/brcm/005-bluetooth_sco_buffer_align.patch
new file mode 100644
index 000000000..77ade1c8b
--- /dev/null
+++ b/target/linux/linux-2.4/patches/brcm/005-bluetooth_sco_buffer_align.patch
@@ -0,0 +1,12 @@
+--- linux-2.4.30/drivers/bluetooth/hci_usb.c	2004-08-08 01:26:04.000000000 +0200
++++ linux-2.4.30/drivers/bluetooth/hci_usb.c	2005-07-25 20:12:11.000000000 +0200
+@@ -259,6 +259,9 @@
+ 	void *buf;
+ 
+ 	mtu  = husb->isoc_in_ep->wMaxPacketSize;
++#ifdef CONFIG_BCM4710
++	mtu = (mtu + 1) & ~1;		/* brcm: isoc buffers must be aligned on word boundary */
++#endif
+         size = mtu * HCI_MAX_ISOC_FRAMES;
+ 
+ 	buf = kmalloc(size, GFP_ATOMIC);