bluez: update and fix rpi3 support, add required firmware file.

3 files changed, 53 insertions, 36 deletions

diff --git a/package/bluez/patches/patch-tools_bccmd_c b/package/bluez/patches/patch-tools_bccmd_c
deleted file mode 100644
index d9ac8ac35..000000000
--- a/package/bluez/patches/patch-tools_bccmd_c
+++ /dev/null
@@ -1,18 +0,0 @@
---- bluez-5.12.orig/tools/bccmd.c	2013-09-16 10:36:07.000000000 +0200
-+++ bluez-5.12/tools/bccmd.c	2013-12-21 19:19:21.000000000 +0100
-@@ -1159,6 +1159,7 @@ int main(int argc, char *argv[])
- 			case 115200: bcsp_rate = B115200; break;
- 			case 230400: bcsp_rate = B230400; break;
- 			case 460800: bcsp_rate = B460800; break;
-+#if 0
- 			case 500000: bcsp_rate = B500000; break;
- 			case 576000: bcsp_rate = B576000; break;
- 			case 921600: bcsp_rate = B921600; break;
-@@ -1178,6 +1179,7 @@ int main(int argc, char *argv[])
- #ifdef B4000000
- 			case 4000000: bcsp_rate = B4000000; break;
- #endif
-+#endif
- 			default:
- 				printf("Unknown BCSP baud rate specified, defaulting to 38400bps\n");
- 				bcsp_rate = B38400;
diff --git a/package/bluez/patches/patch-tools_hciattach_bcm43xx_c b/package/bluez/patches/patch-tools_hciattach_bcm43xx_c
new file mode 100644
index 000000000..0b8799193
--- /dev/null
+++ b/package/bluez/patches/patch-tools_hciattach_bcm43xx_c
@@ -0,0 +1,32 @@
+--- bluez-5.40.orig/tools/hciattach_bcm43xx.c	2015-03-11 11:01:57.000000000 +0100
++++ bluez-5.40/tools/hciattach_bcm43xx.c	2016-06-18 23:25:59.991459117 +0200
+@@ -43,7 +43,7 @@
+ #include "hciattach.h"
+ 
+ #ifndef FIRMWARE_DIR
+-#define FIRMWARE_DIR "/etc/firmware"
++#define FIRMWARE_DIR "/lib/firmware"
+ #endif
+ 
+ #define FW_EXT ".hcd"
+@@ -366,11 +366,8 @@ int bcm43xx_init(int fd, int def_speed,
+ 		return -1;
+ 
+ 	if (bcm43xx_locate_patch(FIRMWARE_DIR, chip_name, fw_path)) {
+-		fprintf(stderr, "Patch not found, continue anyway\n");
++		fprintf(stderr, "Patch not found for %s, continue anyway\n", chip_name);
+ 	} else {
+-		if (bcm43xx_set_speed(fd, ti, speed))
+-			return -1;
+-
+ 		if (bcm43xx_load_firmware(fd, fw_path))
+ 			return -1;
+ 
+@@ -380,6 +377,7 @@ int bcm43xx_init(int fd, int def_speed,
+ 			return -1;
+ 		}
+ 
++		sleep(1);
+ 		if (bcm43xx_reset(fd))
+ 			return -1;
+ 	}
diff --git a/package/bluez/patches/patch-tools_hciattach_c b/package/bluez/patches/patch-tools_hciattach_c
index 221766348..a1a7bebc6 100644
--- a/package/bluez/patches/patch-tools_hciattach_c
+++ b/package/bluez/patches/patch-tools_hciattach_c
@@ -1,18 +1,21 @@
---- bluez-5.19.orig/tools/hciattach.c	2014-04-12 12:13:29.000000000 +0200
-+++ bluez-5.19/tools/hciattach.c	2014-06-04 16:53:28.000000000 +0200
-@@ -101,6 +101,7 @@ int uart_speed(int s)
- 		return B230400;
- 	case 460800:
- 		return B460800;
-+#if 0
- 	case 500000:
- 		return B500000;
- 	case 576000:
-@@ -135,6 +136,7 @@ int uart_speed(int s)
- 	case 4000000:
- 		return B4000000;
- #endif
-+#endif
- 	default:
- 		return B57600;
- 	}
+--- bluez-5.40.orig/tools/hciattach.c	2016-05-26 18:51:11.000000000 +0200
++++ bluez-5.40/tools/hciattach.c	2016-06-18 23:26:52.616003343 +0200
+@@ -1090,6 +1090,9 @@ struct uart_t uart[] = {
+ 	{ "bcm43xx",    0x0000, 0x0000, HCI_UART_H4,   115200, 3000000,
+ 				FLOW_CTL, DISABLE_PM, NULL, bcm43xx, NULL  },
+ 
++	{ "bcm43xx-3wire",    0x0000, 0x0000, HCI_UART_3WIRE, 115200, 3000000,
++				0, DISABLE_PM, NULL, bcm43xx, NULL  },
++
+ 	{ "ath3k",    0x0000, 0x0000, HCI_UART_ATH3K, 115200, 115200,
+ 			FLOW_CTL, DISABLE_PM, NULL, ath3k_ps, ath3k_pm  },
+ 
+@@ -1236,7 +1239,7 @@ int main(int argc, char *argv[])
+ {
+ 	struct uart_t *u = NULL;
+ 	int detach, printpid, raw, opt, i, n, ld, err;
+-	int to = 10;
++	int to = 30;
+ 	int init_speed = 0;
+ 	int send_break = 0;
+ 	pid_t pid;