 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * Written by Iain Hibbert for Itronix Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -57,27 +57,27 @@
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * This driver originally written by Lennart Augustsson and David Sainty,
  * but was mostly rewritten for the NetBSD Bluetooth protocol stack by
  * Iain Hibbert for Itronix, Inc using the FreeBSD ng_ubt.c driver as a
  * reference.
  */
 #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>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 @@ -295,46 +295,54 @@ static const struct hci_if ubt_hci = {
 int             ubt_match(device_t, cfdata_t, void *);
 void            ubt_attach(device_t, device_t, void *);
 int             ubt_detach(device_t, int);
 int             ubt_activate(device_t, enum devact);
 extern struct cfdriver ubt_cd;
 CFATTACH_DECL_NEW(ubt, sizeof(struct ubt_softc), ubt_match, ubt_attach, ubt_detach, ubt_activate);
 static int ubt_set_isoc_config(struct ubt_softc *);
 static int ubt_sysctl_config(SYSCTLFN_PROTO);
 static void ubt_abortdealloc(struct ubt_softc *);
 /*
- * Match against the whole device, since we want to take
+ * To match or ignore forcibly, add
  * both interfaces. If a device should be ignored then 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[] = {
+const struct ubt_devno {
-	{ USB_VENDOR_BROADCOM, USB_PRODUCT_BROADCOM_BCM2033NF },
+	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))
+	if ((dev = ubt_lookup(uaa->vendor, uaa->product)) != NULL)
-		return UMATCH_NONE;
+		return dev->match;
 	if (uaa->class == UDCLASS_WIRELESS
 	    && uaa->subclass == UDSUBCLASS_RF
 	    && uaa->proto == UDPROTO_BLUETOOTH)
 		return UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO;
 	return UMATCH_NONE;
+}
 void
 ubt_attach(device_t parent, device_t self, void *aux)
+{
 	struct ubt_softc *sc = device_private(self);

 @@ -1,14 +1,14 @@
-$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -833,26 +833,27 @@ product APPLE GEYSER1_TP	0x030b	Apple In
 product APPLE MAGICMOUSE	0x030d	Magic Mouse
 product APPLE BLUETOOTH_HIDMODE	0x1000	Bluetooth HCI (HID-proxy mode)
 product APPLE EXT_KBD_HUB	0x1003	Hub in Apple Extended USB Keyboard
 product APPLE SPEAKERS		0x1101	Speakers
 product APPLE SHUFFLE2	0x1301	iPod Shuffle (2nd generation)
 product APPLE IPHONE		0x1290	iPhone
 product APPLE IPOD_TOUCH	0x1291	iPod Touch
 product APPLE IPOD_TOUCH_4G	0x129e	iPod Touch 4G
 product APPLE IPHONE_3G		0x1292	iPhone 3G
 product APPLE IPHONE_3GS	0x1294	iPhone 3GS
 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 */
 product ARKMICROCHIPS USBSERIAL 0x0232	USB-UART Controller
 /* Asahi Optical products */
 product ASAHIOPTICAL OPTIO230	0x0004	PENTAX Optio230
 product ASAHIOPTICAL OPTIO330	0x0006	Digital camera
 /* Asante products */
 product ASANTE EA		0x1427	Ethernet Adapter
 /* Askey Computer products */