svn commit: r260482 - head/sys/netgraph/bluetooth/drivers/ubt

[Adrian Chadd]

Author: adrian
Date: Thu Jan  9 15:31:44 2014
New Revision: 260482
URL: http://svnweb.freebsd.org/changeset/base/260482

Log:
  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

Modified:
  head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c

Modified: head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
==============================================================================
--- head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c	Thu Jan  9 14:58:06 2014	(r260481)
+++ head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c	Thu Jan  9 15:31:44 2014	(r260482)
@@ -399,26 +399,26 @@ static const STRUCT_USB_HOST_ID ubt_igno
 	{ 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 */