summaryrefslogtreecommitdiffstats
path: root/sys/netgraph/bluetooth
diff options
context:
space:
mode:
authoradrian <adrian@FreeBSD.org>2014-01-09 15:31:44 +0000
committeradrian <adrian@FreeBSD.org>2014-01-09 15:31:44 +0000
commitb66c9c2304022dcf75271d4958c94a9de49b9d42 (patch)
tree2b0fd1333456593c8f260c283505a42579f0faf0 /sys/netgraph/bluetooth
parent1e65346e1debbab02834a074b9db084895d24565 (diff)
downloadFreeBSD-src-b66c9c2304022dcf75271d4958c94a9de49b9d42.zip
FreeBSD-src-b66c9c2304022dcf75271d4958c94a9de49b9d42.tar.gz
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
Diffstat (limited to 'sys/netgraph/bluetooth')
-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 edbd32c..2488d06 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 */
OpenPOWER on IntegriCloud