svn commit: r184882 - head/sys/dev/usb

[Giorgos Keramidas]

Author: keramida (doc committer)
Date: Wed Nov 12 13:58:59 2008
New Revision: 184882
URL: http://svn.freebsd.org/changeset/base/184882

Log:
  Add a quirk for Belkin USB Bluetooth adapters (F8T012xx1 series)
  
  The same (vendor, product) tuple is used for aue(4) adapters,
  but I am not sure if the quirk is correct.  I'm using the USB
  device 'release' info to skip aue(4) detection right now, but
  if there's a better way to differentiate between USB-LAN and
  USB Bluetooth we should update the quirk.
  
  Reviewed by:	imp, rink
  MFC after:	2 weeks

Modified:
  head/sys/dev/usb/if_aue.c
  head/sys/dev/usb/usbdevs

Modified: head/sys/dev/usb/if_aue.c
==============================================================================
--- head/sys/dev/usb/if_aue.c	Wed Nov 12 13:32:19 2008	(r184881)
+++ head/sys/dev/usb/if_aue.c	Wed Nov 12 13:58:59 2008	(r184882)
@@ -630,6 +630,15 @@ aue_match(device_t self)
 	if (uaa->iface != NULL)
 		return (UMATCH_NONE);
 
+	/*
+	 * Belkin USB Bluetooth dongles of the F8T012xx1 model series conflict
+	 * with older Belkin USB2LAN adapters.  Skip if_aue if we detect one of
+	 * the devices that look like Bluetooth adapters.
+	 */
+	if (uaa->vendor == USB_VENDOR_BELKIN &&
+	    uaa->product == USB_PRODUCT_BELKIN_F8T012 && uaa->release == 0x0413)
+		return (UMATCH_NONE);
+
 	return (aue_lookup(uaa->vendor, uaa->product) != NULL ?
 		UMATCH_VENDOR_PRODUCT : UMATCH_NONE);
 }

Modified: head/sys/dev/usb/usbdevs
==============================================================================
--- head/sys/dev/usb/usbdevs	Wed Nov 12 13:32:19 2008	(r184881)
+++ head/sys/dev/usb/usbdevs	Wed Nov 12 13:58:59 2008	(r184882)
@@ -932,6 +932,7 @@ product BELKIN FBT003V		0x0084	FBT003v2 
 product BELKIN F5U103		0x0103	F5U103 Serial
 product BELKIN F5U109		0x0109	F5U109 Serial
 product BELKIN USB2SCSI		0x0115	USB to SCSI
+product BELKIN F8T012		0x0121	F8T012xx1 Bluetooth USB Adapter
 product BELKIN USB2LAN		0x0121	USB to LAN
 product BELKIN F5U208		0x0208	F5U208 VideoBus II
 product BELKIN F5U237		0x0237	F5U237 USB 2.0 7-Port Hub