Skip to contentSkip to conversation

Bluetooth: hci_uart: Add support Intel address configuration

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

lore
Share & tools
lore

Marcel Holtmann

author maintainer
#0 lore raw

PATCH 2/3 Bluetooth: hci_uart: Add support Intel address configuration

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

Signed-off-by Marcel Holtmann <[email protected]>
---
 drivers/bluetooth/Kconfig     |  9 ++++++++
 drivers/bluetooth/Makefile    |  1 +
 drivers/bluetooth/hci_intel.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_intel.c
drivers/bluetooth/Kconfig +9 -0
index 364f080768d0..4356f718ea3d 100644
@@ -94,6 +94,15 @@ config BT_HCIUART_3WIRE
 
 	  Say Y here to compile support for Three-wire UART protocol.
 
+config BT_HCIUART_INTEL
+	bool "Intel protocol support"
+	depends on BT_HCIUART
+	help
+	  The Intel protocol support enables Bluetooth HCI over serial
+	  port interface for Intel Bluetooth controllers.
+
+	  Say Y here to compile support for Intel protocol.
+
 config BT_HCIBCM203X
 	tristate "HCI BCM203x USB driver"
 	depends on USB
drivers/bluetooth/Makefile +1 -0
index 9fe8a875a827..adb99457d016 100644
@@ -29,6 +29,7 @@ hci_uart-$(CONFIG_BT_HCIUART_BCSP)	+= hci_bcsp.o
 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-objs				:= $(hci_uart-y)
 
 ccflags-y += -D__CHECK_ENDIAN__
drivers/bluetooth/hci_intel.c new file +48 -0

48 lines not on this page · raw message

drivers/bluetooth/hci_ldisc.c +5 -0
index b1e8083044ce..03f9defac39d 100644
@@ -290,6 +290,11 @@ static int hci_uart_setup(struct hci_dev *hdev)
 	ver = (struct hci_rp_read_local_version *)skb->data;
 
 	switch (le16_to_cpu(ver->manufacturer)) {
+#ifdef CONFIG_BT_HCIUART_INTEL
+	case 2:
+		hdev->set_bdaddr = intel_set_bdaddr;
+		break;
+#endif
 	}
 
 done:
drivers/bluetooth/hci_uart.h +6 -1
index 22a5f7c74266..687aa7e9eb2e 100644
@@ -35,7 +35,7 @@
 #define HCIUARTGETFLAGS		_IOR('U', 204, int)
 
 /* UART protocols */
-#define HCI_UART_MAX_PROTO	6
+#define HCI_UART_MAX_PROTO	7
 
 #define HCI_UART_H4	0
 #define HCI_UART_BCSP	1

@@ -43,6 +43,7 @@
 #define HCI_UART_H4DS	3
 #define HCI_UART_LL	4
 #define HCI_UART_ATH3K	5
+#define HCI_UART_INTEL	6
 
 #define HCI_UART_RAW_DEVICE	0
 #define HCI_UART_RESET_ON_INIT	1

@@ -118,3 +119,7 @@ int ath_deinit(void);
 int h5_init(void);
 int h5_deinit(void);
 #endif
+
+#ifdef CONFIG_BT_HCIUART_INTEL
+int intel_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr);
+#endif
Signature · 1 line
2.1.0