[src/trunk]: src/sys/dev/usb recognize apple bluetooth adapter in MacBook Air...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c62f2ed43f7e
branches:  trunk
changeset: 781909:c62f2ed43f7e
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Oct 06 14:37:41 2012 +0000

description:
recognize apple bluetooth adapter in MacBook Air. (Ryo Onodera)

diffstat:

 sys/dev/usb/ubt.c   |  28 ++++++++++++++++++----------
 sys/dev/usb/usbdevs |   3 ++-
 2 files changed, 20 insertions(+), 11 deletions(-)

diffs (78 lines):

diff -r 1854ec668564 -r c62f2ed43f7e sys/dev/usb/ubt.c
--- a/sys/dev/usb/ubt.c Sat Oct 06 14:10:46 2012 +0000
+++ b/sys/dev/usb/ubt.c Sat Oct 06 14:37:41 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ubt.c,v 1.48 2012/06/02 21:36:45 dsl Exp $     */
+/*     $NetBSD: ubt.c,v 1.49 2012/10/06 14:37:41 christos Exp $        */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.48 2012/06/02 21:36:45 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.49 2012/10/06 14:37:41 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -305,26 +305,34 @@
 static void ubt_abortdealloc(struct ubt_softc *);
 
 /*
- * Match against the whole device, since we want to take
- * both interfaces. If a device should be ignored then add
+ * To match or ignore forcibly, add
  *
- *     { VendorID, ProductID }
+ *     { { VendorID, ProductID } , UMATCH_VENDOR_PRODUCT|UMATCH_NONE }
  *
- * to the ubt_ignore list.
+ * to the ubt_dev list.
  */
-static const struct usb_devno ubt_ignore[] = {
-       { USB_VENDOR_BROADCOM, USB_PRODUCT_BROADCOM_BCM2033NF },
+const struct ubt_devno {
+       struct usb_devno        devno;
+       int                     match;
+} ubt_dev[] = {
+       { { USB_VENDOR_BROADCOM, USB_PRODUCT_BROADCOM_BCM2033NF },
+         UMATCH_NONE },
+       { { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_BLUETOOTH_HOST_C },
+         UMATCH_VENDOR_PRODUCT },
 };
+#define ubt_lookup(vendor, product) \
+       ((const struct ubt_devno *)usb_lookup(ubt_dev, vendor, product))
 
 int 
 ubt_match(device_t parent, cfdata_t match, void *aux)
 {
        struct usb_attach_arg *uaa = aux;
+       const struct ubt_devno *dev;
 
        DPRINTFN(50, "ubt_match\n");
 
-       if (usb_lookup(ubt_ignore, uaa->vendor, uaa->product))
-               return UMATCH_NONE;
+       if ((dev = ubt_lookup(uaa->vendor, uaa->product)) != NULL)
+               return dev->match;
 
        if (uaa->class == UDCLASS_WIRELESS
            && uaa->subclass == UDSUBCLASS_RF
diff -r 1854ec668564 -r c62f2ed43f7e sys/dev/usb/usbdevs
--- a/sys/dev/usb/usbdevs       Sat Oct 06 14:10:46 2012 +0000
+++ b/sys/dev/usb/usbdevs       Sat Oct 06 14:37:41 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.629 2012/10/05 22:04:56 khorben Exp $
+$NetBSD: usbdevs,v 1.630 2012/10/06 14:37:41 christos Exp $
 
 /*
  * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -843,6 +843,7 @@
 product APPLE IPAD             0x129a  Apple iPad
 product APPLE ETHERNET         0x1402  Apple USB to Ethernet
 product APPLE BLUETOOTH2       0x8205  Bluetooth
+product APPLE BLUETOOTH_HOST_C 0x821f  Bluetooth USB Host Controller
 product APPLE BLUETOOTH                0x8300  Bluetooth
 
 /* ArkMicroChips products */