Re: [Bluez-devel] Digianswer USB driver

[Marcel Holtmann <marcel@holtmann.org>]

[-- Attachment #1: Type: text/plain, Size: 237 bytes --]

Hi Jan,

> I've compiled a kernel with MODVERSION and now hci_usb loads without
> trouble. I've tried to do hciconfig hci0 up but this gives:
> Can't init device hci0. Connection timed out(110)

what about this patch?

Regards

Marcel



[-- Attachment #2: patch-hci-usb-digianswer2 --]
[-- Type: text/x-patch, Size: 1888 bytes --]

diff -urN linux-2.4.22/drivers/bluetooth/hci_usb.c linux-2.4.22-digianswer/drivers/bluetooth/hci_usb.c
--- linux-2.4.22/drivers/bluetooth/hci_usb.c	Mon Aug 25 13:44:41 2003
+++ linux-2.4.22-digianswer/drivers/bluetooth/hci_usb.c	Mon Sep 22 19:57:15 2003
@@ -70,6 +70,9 @@
 static struct usb_driver hci_usb_driver; 
 
 static struct usb_device_id bluetooth_ids[] = {
+	/* Digianswer device */
+	{ USB_DEVICE(0x08fd, 0x0001), driver_info: HCI_DIGIANSWER },
+
 	/* Generic Bluetooth USB device */
 	{ USB_DEVICE_INFO(HCI_DEV_CLASS, HCI_DEV_SUBCLASS, HCI_DEV_PROTOCOL) },
 
@@ -427,7 +430,7 @@
 	} else
 		dr = (void *) _urb->urb.setup_packet;
 
-	dr->bRequestType = HCI_CTRL_REQ;
+	dr->bRequestType = husb->ctrl_req;
 	dr->bRequest = 0;
 	dr->wIndex   = 0;
 	dr->wValue   = 0;
@@ -872,6 +875,11 @@
 	husb->bulk_out_ep = bulk_out_ep[0];
 	husb->bulk_in_ep  = bulk_in_ep[0];
 	husb->intr_in_ep  = intr_in_ep[0];
+
+	if (id->driver_info & HCI_DIGIANSWER)
+		husb->ctrl_req = HCI_DIGI_REQ;
+	else
+		husb->ctrl_req = HCI_CTRL_REQ;
 
 #ifdef CONFIG_BLUEZ_USB_SCO
 	if (isoc_iface) {
diff -urN linux-2.4.22/drivers/bluetooth/hci_usb.h linux-2.4.22-digianswer/drivers/bluetooth/hci_usb.h
--- linux-2.4.22/drivers/bluetooth/hci_usb.h	Fri Jun 13 16:51:32 2003
+++ linux-2.4.22-digianswer/drivers/bluetooth/hci_usb.h	Mon Sep 22 19:56:44 2003
@@ -35,6 +35,9 @@
 #define HCI_DEV_PROTOCOL     0x01	/* Bluetooth programming protocol */
 
 #define HCI_CTRL_REQ	     0x20
+#define HCI_DIGI_REQ	     0x40
+
+#define HCI_DIGIANSWER       0x01
 
 #define HCI_MAX_IFACE_NUM	3 
 
@@ -118,6 +121,8 @@
 	struct usb_interface            *isoc_iface;
 	struct usb_endpoint_descriptor	*isoc_out_ep;
 	struct usb_endpoint_descriptor	*isoc_in_ep;
+
+	__u8			ctrl_req;
 
 	struct sk_buff_head	transmit_q[4];
 	struct sk_buff		*reassembly[4]; // Reassembly buffers