Bluetooth: Add initial skeleton for Intel BT USB support

index f637c25..029c5b7 100644
@@ -27,6 +27,8 @@
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
 
+#include "btusb.h"
+
 #define VERSION "0.6"
 
 static bool ignore_dga;

@@ -47,6 +49,8 @@ static struct usb_driver btusb_driver;
 #define BTUSB_BROKEN_ISOC	0x20
 #define BTUSB_WRONG_SCO_MTU	0x40
 #define BTUSB_ATH3012		0x80
+#define BTUSB_INTEL			0x100
+#define BTUSB_DEV_INIT		0x8000
 
 static struct usb_device_id btusb_table[] = {
 	/* Generic Bluetooth USB device */

@@ -190,6 +194,9 @@ static struct usb_device_id blacklist_table[] = {
 	/* Frontline ComProbe Bluetooth Sniffer */
 	{ USB_DEVICE(0x16d3, 0x0002), .driver_info = BTUSB_SNIFFER },
 
+	/* Intel Bluetooth device */
+	{ USB_DEVICE(0x8087, 0x07dc), .driver_info = BTUSB_DEV_INIT | BTUSB_INTEL },
+
 	{ }	/* Terminating entry */
 };
 

@@ -235,6 +242,17 @@ struct btusb_data {
 	int suspend_count;
 };
 
+struct btusb_vendor_dev {
+	unsigned long info;
+	int (*vsdev_init)(struct hci_dev *hdev);
+	void (*vsdev_event)(struct hci_dev *hdev, struct sk_buff *skb);
+};
+
+static struct btusb_vendor_dev vendor_dev[] = {
+	{ BTUSB_INTEL, btusb_intel_init, btusb_intel_event },
+	{ 0 }
+};
+
 static int inc_tx(struct btusb_data *data)
 {
 	unsigned long flags;

@@ -1069,6 +1087,17 @@ static int btusb_probe(struct usb_interface *intf,
 		}
 	}
 
+	/* vendor specific device initialization */
+	if (id->driver_info & BTUSB_DEV_INIT) {
+		for (i = 0; vendor_dev[i].info; i++) {
+			if (id->driver_info & vendor_dev[i].info) {
+				hdev->vsdev_init = vendor_dev[i].vsdev_init;
+				hdev->vsdev_event = vendor_dev[i].vsdev_event;
+				break;
+			}
+		}
+	}
+
 	err = hci_register_dev(hdev);
 	if (err < 0) {
 		hci_free_dev(hdev);

new file mode 100644
index 0000000..f03040f
@@ -0,0 +1,31 @@
+/*
+ *
+ *  Generic Bluetooth USB driver
+ *
+ *  Copyright (C) 2005-2008  Marcel Holtmann <[email protected]>
+ *
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#ifndef __BTUSB_H
+#define __BTUSB_H
+
+/* Intel specific device initialization callbacks */
+int btusb_intel_init(struct hci_dev *hdev);
+void btusb_intel_event(struct hci_dev *hdev, struct sk_buff *skb);
+
+#endif /* __BTUSB_H */

81 lines not on this page · raw message

index 6a3337e..cde0ddd 100644
@@ -275,6 +275,12 @@ struct hci_dev {
 	int (*send)(struct sk_buff *skb);
 	void (*notify)(struct hci_dev *hdev, unsigned int evt);
 	int (*ioctl)(struct hci_dev *hdev, unsigned int cmd, unsigned long arg);
+
+	int  			vsdev_init_completed;
+	void 			*vsdev_init_data;
+
+	int  (*vsdev_init)(struct hci_dev *hdev);
+	void (*vsdev_event)(struct hci_dev *hdev, struct sk_buff *skb);
 };
 
 struct hci_conn {

index e407051..4b23812 100644
@@ -685,6 +685,17 @@ int hci_dev_open(__u16 dev)
 		set_bit(HCI_INIT, &hdev->flags);
 		hdev->init_last_cmd = 0;
 
+		if (hdev->vsdev_init && !hdev->vsdev_init_completed) {
+			ret = hdev->vsdev_init(hdev);
+			BT_DBG("vsdev_init completed: %d", ret);
+			/* set this flag so vsdev_init() execute only once */
+			hdev->vsdev_init_completed = 1;
+			/* make sure to use generic event handler */
+			hdev->vsdev_event = NULL;
+			if (ret < 0)
+				goto done;
+		}
+
 		ret = __hci_request(hdev, hci_init_req, 0, HCI_INIT_TIMEOUT);
 
 		if (lmp_host_le_capable(hdev))

@@ -2119,6 +2130,7 @@ int hci_send_cmd(struct hci_dev *hdev, __u16 opcode, __u32 plen, void *param)
 
 	return 0;
 }
+EXPORT_SYMBOL(hci_send_cmd);
 
 /* Get data from the previously sent command */
 void *hci_sent_cmd_data(struct hci_dev *hdev, __u16 opcode)

@@ -2800,7 +2812,11 @@ static void hci_rx_work(struct work_struct *work)
 		switch (bt_cb(skb)->pkt_type) {
 		case HCI_EVENT_PKT:
 			BT_DBG("%s Event packet", hdev->name);
+			/* send packet to device init event handler */
+			if (hdev->vsdev_init_completed || !hdev->vsdev_event)
 			hci_event_packet(hdev, skb);
+			else
+				hdev->vsdev_event(hdev, skb);
 			break;
 
 		case HCI_ACLDATA_PKT: