Bluetooth: hci_uart: Add support Broadcom address configuration

PATCH In review Marcel Holtmann 1 participant 1 message Apr 4, 2015 Bluetooth drivers

lore

Share & tools

lore

Marcel Holtmann

author maintainer

2015-04-04 23:13 UTC #0 lore raw

PATCH 3/3 Bluetooth: hci_uart: Add support Broadcom address configuration

When using vendor detection, this adds support for the Broadcom specific address configuration command.

Signed-off-by Marcel Holtmann <[email protected]>

---
 drivers/bluetooth/Kconfig     |  9 ++++++++
 drivers/bluetooth/Makefile    |  1 +
 drivers/bluetooth/hci_bcm.c   | 48 +++++++++++++++++++++++++++++++++++++++++++
 drivers/bluetooth/hci_ldisc.c |  5 +++++
 drivers/bluetooth/hci_uart.h  |  7 ++++++-
 5 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 drivers/bluetooth/hci_bcm.c

drivers/bluetooth/Kconfig +9 -0

index 4356f718ea3d..e8630b605aa9 100644
@@ -103,6 +103,15 @@ config BT_HCIUART_INTEL
 
 	  Say Y here to compile support for Intel protocol.
 
+config BT_HCIUART_BCM
+	bool "Broadcom protocol support"
+	depends on BT_HCIUART
+	help
+	  The Broadcom protocol support enables Bluetooth HCI over serial
+	  port interface for Broadcom Bluetooth controllers.
+
+	  Say Y here to compile support for Broadcom protocol.
+
 config BT_HCIBCM203X
 	tristate "HCI BCM203x USB driver"
 	depends on USB

drivers/bluetooth/Makefile +1 -0

index adb99457d016..51f9d0c18963 100644
@@ -30,6 +30,7 @@ hci_uart-$(CONFIG_BT_HCIUART_LL)	+= hci_ll.o
 hci_uart-$(CONFIG_BT_HCIUART_ATH3K)	+= hci_ath.o
 hci_uart-$(CONFIG_BT_HCIUART_3WIRE)	+= hci_h5.o
 hci_uart-$(CONFIG_BT_HCIUART_INTEL)	+= hci_intel.o
+hci_uart-$(CONFIG_BT_HCIUART_BCM)	+= hci_bcm.o
 hci_uart-objs				:= $(hci_uart-y)
 
 ccflags-y += -D__CHECK_ENDIAN__

drivers/bluetooth/hci_bcm.c new file +48 -0

48 lines not on this page · raw message

drivers/bluetooth/hci_ldisc.c +5 -0

index 03f9defac39d..b6d1ff4fbba6 100644
@@ -295,6 +295,11 @@ static int hci_uart_setup(struct hci_dev *hdev)
 		hdev->set_bdaddr = intel_set_bdaddr;
 		break;
 #endif
+#ifdef CONFIG_BT_HCIUART_BCM
+	case 15:
+		hdev->set_bdaddr = bcm_set_bdaddr;
+		break;
+#endif
 	}
 
 done:

drivers/bluetooth/hci_uart.h +6 -1

index 687aa7e9eb2e..4dc8ab3009a9 100644
@@ -35,7 +35,7 @@
 #define HCIUARTGETFLAGS		_IOR('U', 204, int)
 
 /* UART protocols */
-#define HCI_UART_MAX_PROTO	7
+#define HCI_UART_MAX_PROTO	8
 
 #define HCI_UART_H4	0
 #define HCI_UART_BCSP	1

@@ -44,6 +44,7 @@
 #define HCI_UART_LL	4
 #define HCI_UART_ATH3K	5
 #define HCI_UART_INTEL	6
+#define HCI_UART_BCM	7
 
 #define HCI_UART_RAW_DEVICE	0
 #define HCI_UART_RESET_ON_INIT	1

@@ -123,3 +124,7 @@ int h5_deinit(void);
 #ifdef CONFIG_BT_HCIUART_INTEL
 int intel_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr);
 #endif
+
+#ifdef CONFIG_BT_HCIUART_BCM
+int bcm_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr);
+#endif

Signature · 1 line

2.1.0