Skip to contentSkip to conversation

btusb: Raw mode and ACL/SCO data

PATCH In review Kim B. Heino 2 participants 2 messages Apr 7, 2010 – Apr 8, 2010 Bluetooth drivers

lore
Share & tools
lore

Kim B. Heino

author
#0 lore raw

PATCH 1/1 btusb: Raw mode and ACL/SCO data

This patch allows sending ACL/SCO packets if device is in RAW mode. Previously only command packets were allowed.

Signed-off-by Kim B. Heino <[email protected]>
drivers/bluetooth/btusb.c +6 -2
diff -ur orig/drivers/bluetooth/btusb.c linux-2.6.33.2/drivers/bluetooth/btusb.c
@@ -663,7 +663,9 @@
 		break;
 
 	case HCI_ACLDATA_PKT:
-		if (!data->bulk_tx_ep || hdev->conn_hash.acl_num < 1)
+		if (!data->bulk_tx_ep ||
+		    (!test_bit(HCI_RAW, &hdev->flags) &&
+		     hdev->conn_hash.acl_num < 1))
 			return -ENODEV;
 
 		urb = usb_alloc_urb(0, GFP_ATOMIC);

@@ -680,7 +682,9 @@
 		break;
 
 	case HCI_SCODATA_PKT:
-		if (!data->isoc_tx_ep || hdev->conn_hash.sco_num < 1)
+		if (!data->isoc_tx_ep ||
+		    (!test_bit(HCI_RAW, &hdev->flags) &&
+		     hdev->conn_hash.sco_num < 1))
 			return -ENODEV;
 
 		urb = usb_alloc_urb(BTUSB_MAX_ISOC_FRAMES, GFP_ATOMIC);
maintainer
#1 lore raw

Hi Kim,

Quoted 2 lines

This patch allows sending ACL/SCO packets if device is in RAW mode. Previously only command packets were allowed.

so do I really wanna know why such a change is required?

drivers/bluetooth/btusb.c line 669

Quoted 12 lines

diff -ur orig/drivers/bluetooth/btusb.c linux-2.6.33.2/drivers/bluetooth/btusb.c

drivers/bluetooth/btusb.c +3 -1
@@ -663,7 +663,9 @@
 		break;
 
 	case HCI_ACLDATA_PKT:
-		if (!data->bulk_tx_ep || hdev->conn_hash.acl_num < 1)
+		if (!data->bulk_tx_ep ||
+		    (!test_bit(HCI_RAW, &hdev->flags) &&
+		     hdev->conn_hash.acl_num < 1))
 			return -ENODEV;

Actually this one is wrong. The conn_hash.acl_num check just has to go away. We always start the bulk URBs anyway since otherwise a lot of devices break. We had to figure this out the hard way. Some device manufactures have endpoints that rely on each other and do their flow control based on submitted URBs.

So no need to do another HCI_RAW test here.

drivers/bluetooth/btusb.c line 690

Quoted 12 lines
drivers/bluetooth/btusb.c +3 -1
 		urb = usb_alloc_urb(0, GFP_ATOMIC);

@@ -680,7 +682,9 @@
 		break;
 
 	case HCI_SCODATA_PKT:
-		if (!data->isoc_tx_ep || hdev->conn_hash.sco_num < 1)
+		if (!data->isoc_tx_ep ||
+		    (!test_bit(HCI_RAW, &hdev->flags) &&
+		     hdev->conn_hash.sco_num < 1))
 			return -ENODEV;
 
 		urb = usb_alloc_urb(BTUSB_MAX_ISOC_FRAMES, GFP_ATOMIC);

And my assumption is that you only tested ACL data since this clearly doesn't do anything useful. The isoc URBs and incoming data are not magically started only because you pass this checkpoint.

No SCO links and no isoc URBs in the system. Period. If you wanna disable the kernel Bluetooth stack, then you don't get SCO support over USB.

Regards

Marcel