main/bluez: version upgrade and patches for bcm43xx

Upgrades bluez from version 5.39 to 5.40 and adds patches from the
Raspberry Pi Foundation to support the bcm43xx chip on the RPi3.

5 files changed, 117 insertions, 7 deletions

diff --git a/main/bluez/001-bcm43xx-Add-bcm43xx-3wire-variant.patch b/main/bluez/001-bcm43xx-Add-bcm43xx-3wire-variant.patch
new file mode 100644
index 0000000000..96e8a26c59
--- /dev/null
+++ b/main/bluez/001-bcm43xx-Add-bcm43xx-3wire-variant.patch
@@ -0,0 +1,21 @@
+From b4f2b77472aeb967d3a7595e8a965785c7a37c87 Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.org>
+Date: Tue, 16 Feb 2016 16:40:46 +0000
+Subject: [PATCH 1/4] bcm43xx: Add bcm43xx-3wire variant
+
+---
+ tools/hciattach.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/tools/hciattach.c
++++ b/tools/hciattach.c
+@@ -1144,6 +1144,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  },
+ 
diff --git a/main/bluez/002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch b/main/bluez/002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch
new file mode 100644
index 0000000000..a221861d2c
--- /dev/null
+++ b/main/bluez/002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch
@@ -0,0 +1,33 @@
+From e145c9621f976063e5c573db1f2053d906f63427 Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.org>
+Date: Tue, 16 Feb 2016 16:39:09 +0000
+Subject: [PATCH 2/4] bcm43xx: The UART speed must be reset after the firmware
+ download
+
+---
+ tools/hciattach_bcm43xx.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+--- a/tools/hciattach_bcm43xx.c
++++ b/tools/hciattach_bcm43xx.c
+@@ -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/main/bluez/003-Increase-firmware-load-timeout-to-30s.patch b/main/bluez/003-Increase-firmware-load-timeout-to-30s.patch
new file mode 100644
index 0000000000..fa0948d921
--- /dev/null
+++ b/main/bluez/003-Increase-firmware-load-timeout-to-30s.patch
@@ -0,0 +1,20 @@
+From d41dc2046dd08d8c95197f677e224506f5b39bdd Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.org>
+Date: Wed, 20 Jan 2016 16:00:37 +0000
+Subject: [PATCH 3/4] Increase firmware load timeout to 30s
+
+---
+ tools/hciattach.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/tools/hciattach.c
++++ b/tools/hciattach.c
+@@ -1293,7 +1293,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;
diff --git a/main/bluez/004-Move-the-43xx-firmware-into-lib-firmware.patch b/main/bluez/004-Move-the-43xx-firmware-into-lib-firmware.patch
new file mode 100644
index 0000000000..80b052d5b7
--- /dev/null
+++ b/main/bluez/004-Move-the-43xx-firmware-into-lib-firmware.patch
@@ -0,0 +1,20 @@
+From 76681284b0ea49852041fdb97a35175089a08781 Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.org>
+Date: Tue, 23 Feb 2016 17:52:29 +0000
+Subject: [PATCH 4/4] Move the 43xx firmware into /lib/firmware
+
+---
+ tools/hciattach_bcm43xx.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/tools/hciattach_bcm43xx.c
++++ b/tools/hciattach_bcm43xx.c
+@@ -43,7 +43,7 @@
+ #include "hciattach.h"
+ 
+ #ifndef FIRMWARE_DIR
+-#define FIRMWARE_DIR "/etc/firmware"
++#define FIRMWARE_DIR "/lib/firmware/brcm"
+ #endif
+ 
+ #define FW_EXT ".hcd"
diff --git a/main/bluez/APKBUILD b/main/bluez/APKBUILD
index 6c87baa69f..c47a6c36da 100644
--- a/main/bluez/APKBUILD
+++ b/main/bluez/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=bluez
-pkgver=5.39
+pkgver=5.40
 pkgrel=0
 pkgdesc="Tools for the Bluetooth protocol stack"
 url="http://www.bluez.org/"
@@ -17,6 +17,10 @@ source="http://www.kernel.org/pub/linux/bluetooth/bluez-$pkgver.tar.xz
 	bluetooth.initd
 	rfcomm.initd
 	rfcomm.confd
+        001-bcm43xx-Add-bcm43xx-3wire-variant.patch
+        002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch
+        003-Increase-firmware-load-timeout-to-30s.patch
+        004-Move-the-43xx-firmware-into-lib-firmware.patch
 	"
 
 _builddir="$srcdir"/bluez-$pkgver
@@ -59,15 +63,27 @@ hid2hci() {
 	mv "$pkgdir"/lib "$subpkgdir"/
 }
 
-md5sums="c0c2b8d1151c7538bf3ae7bfc78aa912  bluez-5.39.tar.xz
+md5sums="eb24c0d9eaeb1fb69833f322ec669e8b  bluez-5.40.tar.xz
 4ec3395eff42b3481a0a77f36ca57d0b  bluetooth.initd
 f90b2cc8fe3f0e4bed64b01c0ba0205d  rfcomm.initd
-7f4bb093adb0f519c621f2ea68712f35  rfcomm.confd"
-sha256sums="21d1bc9150d3576296595217efb98a746b592389d25d5637e8bee5da7272593b  bluez-5.39.tar.xz
+7f4bb093adb0f519c621f2ea68712f35  rfcomm.confd
+7b7ee266671efa85a7b4c7c58c1c25cd  001-bcm43xx-Add-bcm43xx-3wire-variant.patch
+456c04933312ce638afb4fcb3d3e39c4  002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch
+1dae20b038ea7697bdbdfcb9429fd6f2  003-Increase-firmware-load-timeout-to-30s.patch
+a54e9af322b150a2773edb639936bd82  004-Move-the-43xx-firmware-into-lib-firmware.patch"
+sha256sums="dada8b812055afcad4546d9966f9a763e4723169e89706e2b240c7b7e998dc27  bluez-5.40.tar.xz
 04395bdcbf69aafea1d127204677c72a6bf42bde1e8f809d31472ec5fa75057d  bluetooth.initd
 9407186d0a647af2228d5603a13cf7aaba5fac842c147aa46334c3d729b552d4  rfcomm.initd
-672498957049fd301f9c9c1dc9fa49430e5e6d3c3f1f3cdce80df3af7d425d08  rfcomm.confd"
-sha512sums="a0c43d0de4dcbfa20bbfe34e805a60703f4b94d0aa6c1d128a0917dfaa490593b26eb555b0a343ff44d1f94349b61776189438039e489ddcf8fe107354740230  bluez-5.39.tar.xz
+672498957049fd301f9c9c1dc9fa49430e5e6d3c3f1f3cdce80df3af7d425d08  rfcomm.confd
+f93802235c344a1eeb43125bd7a995f49bd99cc10aca14a4cc79740a22de4909  001-bcm43xx-Add-bcm43xx-3wire-variant.patch
+e872945550cee1913067c678714a2813c19696a8cc66078780e098af4dbd1bce  002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch
+166b45e8cbfe347d8ccea835274cbbd75bb53989b81121effa0bb8ff49921996  003-Increase-firmware-load-timeout-to-30s.patch
+c8a26033e5eaffe61837a45851d4608d993924bd3ac1d0560aef96f324b6e205  004-Move-the-43xx-firmware-into-lib-firmware.patch"
+sha512sums="44b86f75668fc0bd9552a7864ba50cefe1ae43701e4e3a8195cc125c750fa3e3513bcba00c1a9a1921aaa91a7fd048263a326290dfe238f34ea136f29ce21ade  bluez-5.40.tar.xz
 0a5c652effebe5f2fd968535b2d99e8b9b6983f847fd162f80e5965ade4b7bd12165d27b348506a08503d1bc8c2cf5c8265758ca1e9670dfb5e765edf121fd96  bluetooth.initd
 8d7b7c8938a2316ce0a855e9bdf1ef8fcdf33d23f4011df828270a088b88b140a19c432e83fef15355d0829e3c86be05b63e7718fef88563254ea239b8dc12ac  rfcomm.initd
-a70aa0dbbabe7e29ee81540a6f98bf191a850da55a28f678975635caf34b363cf4d461a801b3484120ee28fdd21240bd456a4f5d706262700924bd2e9a0972fb  rfcomm.confd"
+a70aa0dbbabe7e29ee81540a6f98bf191a850da55a28f678975635caf34b363cf4d461a801b3484120ee28fdd21240bd456a4f5d706262700924bd2e9a0972fb  rfcomm.confd
+73202915fda01d420b2864da77b1c25af5a55c815e9be6546400a0940bfb6097d83322790bc22a80ec0fcd557144fdd1877e243a79285a7f040ff96ba3600b94  001-bcm43xx-Add-bcm43xx-3wire-variant.patch
+d5fd1c962bd846eaa6fff879bab85f753eb367d514f82d133b5d3242e1da989af5eddd942c60a87d5b67783e060f91bfa0f74fb1e8e6699cdee6e5bbe6a431ea  002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch
+784e9644c8de4e2693e2eeed988a245608b8cb14e1fc0dff8795c60c527b2e8d0c87862cfbfd6b850b47ae80cdf993a5ed3f477078ea1068fd7374899c7a1a77  003-Increase-firmware-load-timeout-to-30s.patch
+42ac04044a8c66e07487598b3a75ef52efc32999ebce4e7c63f6198e2f603f4a1442e74600e43a0938cb4f52d4db0298aa99050b18144b84990cda71748e9de5  004-Move-the-43xx-firmware-into-lib-firmware.patch"