aboutsummaryrefslogtreecommitdiff
path: root/sys/netgraph
diff options
context:
space:
mode:
authorAdrian Chadd <adrian@FreeBSD.org>2014-01-09 15:31:44 +0000
committerAdrian Chadd <adrian@FreeBSD.org>2014-01-09 15:31:44 +0000
commit0818ec92ee8c832427fe23057dfdd7f3272a85ae (patch)
tree2b0fd1333456593c8f260c283505a42579f0faf0 /sys/netgraph
parent0a6b0ffa54c45f259b17f39f9c79426f6b0babaa (diff)
downloadsrc-0818ec92ee8c832427fe23057dfdd7f3272a85ae.tar.gz
src-0818ec92ee8c832427fe23057dfdd7f3272a85ae.zip
Be much more specific (and correct) about the device id matching.
These device IDs have an AR3012 bluetooth device that shows up with bcdDevice=1 when it doesn't have the firmware loaded, and bcdDevice=2 when it's ready to speak full HCI. Tested: * AR5B225 PCIe - AR9485 + AR3012
Notes
Notes: svn path=/head/; revision=260482
Diffstat (limited to 'sys/netgraph')
-rw-r--r--sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
index edbd32ccd5a3..2488d06ae6a1 100644
--- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
+++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
@@ -399,26 +399,26 @@ static const STRUCT_USB_HOST_ID ubt_ignore_devs[] =
{ USB_VPI(0x03f0, 0x311d, 0) },
/* Atheros 3012 with sflash firmware */
- { USB_VPI(0x0cf3, 0x3004, 0) },
- { USB_VPI(0x0cf3, 0x311d, 0) },
- { USB_VPI(0x13d3, 0x3375, 0) },
- { USB_VPI(0x04ca, 0x3005, 0) },
- { USB_VPI(0x04ca, 0x3006, 0) },
- { USB_VPI(0x04ca, 0x3008, 0) },
- { USB_VPI(0x13d3, 0x3362, 0) },
- { USB_VPI(0x0cf3, 0xe004, 0) },
- { USB_VPI(0x0930, 0x0219, 0) },
- { USB_VPI(0x0489, 0xe057, 0) },
- { USB_VPI(0x13d3, 0x3393, 0) },
- { USB_VPI(0x0489, 0xe04e, 0) },
- { USB_VPI(0x0489, 0xe056, 0) },
+ { USB_VPI(0x0cf3, 0x3004, 0), USB_DEV_BCD_LTEQ(1) },
+ { USB_VPI(0x0cf3, 0x311d, 0), USB_DEV_BCD_LTEQ(1) },
+ { USB_VPI(0x13d3, 0x3375, 0), USB_DEV_BCD_LTEQ(1) },
+ { USB_VPI(0x04ca, 0x3005, 0), USB_DEV_BCD_LTEQ(1) },
+ { USB_VPI(0x04ca, 0x3006, 0), USB_DEV_BCD_LTEQ(1) },
+ { USB_VPI(0x04ca, 0x3008, 0), USB_DEV_BCD_LTEQ(1) },
+ { USB_VPI(0x13d3, 0x3362, 0), USB_DEV_BCD_LTEQ(1) },
+ { USB_VPI(0x0cf3, 0xe004, 0), USB_DEV_BCD_LTEQ(1) },
+ { USB_VPI(0x0930, 0x0219, 0), USB_DEV_BCD_LTEQ(1) },
+ { USB_VPI(0x0489, 0xe057, 0), USB_DEV_BCD_LTEQ(1) },
+ { USB_VPI(0x13d3, 0x3393, 0), USB_DEV_BCD_LTEQ(1) },
+ { USB_VPI(0x0489, 0xe04e, 0), USB_DEV_BCD_LTEQ(1) },
+ { USB_VPI(0x0489, 0xe056, 0), USB_DEV_BCD_LTEQ(1) },
/* Atheros AR5BBU12 with sflash firmware */
- { USB_VPI(0x0489, 0xe02c, 0) },
+ { USB_VPI(0x0489, 0xe02c, 0), USB_DEV_BCD_LTEQ(1) },
/* Atheros AR5BBU12 with sflash firmware */
- { USB_VPI(0x0489, 0xe03c, 0) },
- { USB_VPI(0x0489, 0xe036, 0) },
+ { USB_VPI(0x0489, 0xe03c, 0), USB_DEV_BCD_LTEQ(1) },
+ { USB_VPI(0x0489, 0xe036, 0), USB_DEV_BCD_LTEQ(1) },
};
/* List of supported bluetooth devices */