svn commit: r255345 - in stable/9/sys: dev/usb netgraph/bluetooth/drivers/ubt

[Hans Petter Selasky]

Author: hselasky
Date: Sat Sep  7 06:38:34 2013
New Revision: 255345
URL: http://svnweb.freebsd.org/changeset/base/255345

Log:
  MFC r255090 and r255128:
  
  PR:		kern/181728

Modified:
  stable/9/sys/dev/usb/usbdevs
  stable/9/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/usb/usbdevs
==============================================================================
--- stable/9/sys/dev/usb/usbdevs	Sat Sep  7 05:44:53 2013	(r255344)
+++ stable/9/sys/dev/usb/usbdevs	Sat Sep  7 06:38:34 2013	(r255345)
@@ -515,11 +515,13 @@ vendor USR		0x0baf	U.S. Robotics
 vendor AMBIT		0x0bb2	Ambit Microsystems
 vendor HTC		0x0bb4	HTC
 vendor REALTEK		0x0bda	Realtek
+vendor ERICSSON2	0x0bdb	Ericsson
 vendor MEI		0x0bed	MEI
 vendor ADDONICS2	0x0bf6	Addonics Technology
 vendor FSC		0x0bf8	Fujitsu Siemens Computers
 vendor AGATE		0x0c08	Agate Technologies
 vendor DMI		0x0c0b	DMI
+vendor CANYON		0x0c10	Canyon
 vendor ICOM		0x0c26	Icom Inc.
 vendor GNOTOMETRICS	0x0c33	GN Otometrics
 vendor CHICONY2		0x0c45	Chicony

Modified: stable/9/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
==============================================================================
--- stable/9/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c	Sat Sep  7 05:44:53 2013	(r255344)
+++ stable/9/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c	Sat Sep  7 06:38:34 2013	(r255345)
@@ -404,6 +404,67 @@ static const STRUCT_USB_HOST_ID ubt_devs
 	  USB_IFACE_CLASS(UICLASS_VENDOR),
 	  USB_IFACE_SUBCLASS(UDSUBCLASS_RF),
 	  USB_IFACE_PROTOCOL(UDPROTO_BLUETOOTH) },
+
+	/* Apple-specific (Broadcom) devices */
+	{ USB_VENDOR(USB_VENDOR_APPLE),
+	  USB_IFACE_CLASS(UICLASS_VENDOR),
+	  USB_IFACE_SUBCLASS(UDSUBCLASS_RF),
+	  USB_IFACE_PROTOCOL(UDPROTO_BLUETOOTH) },
+
+	/* Foxconn - Hon Hai */
+	{ USB_VENDOR(USB_VENDOR_FOXCONN),
+	  USB_IFACE_CLASS(UICLASS_VENDOR),
+	  USB_IFACE_SUBCLASS(UDSUBCLASS_RF),
+	  USB_IFACE_PROTOCOL(UDPROTO_BLUETOOTH) },
+
+	/* MediaTek MT76x0E */
+	{ USB_VPI(USB_VENDOR_MEDIATEK, 0x763f, 0) },
+
+	/* Broadcom SoftSailing reporting vendor specific */
+	{ USB_VPI(USB_VENDOR_BROADCOM, 0x21e1, 0) },
+
+	/* Apple MacBookPro 7,1 */
+	{ USB_VPI(USB_VENDOR_APPLE, 0x8213, 0) },
+
+	/* Apple iMac11,1 */
+	{ USB_VPI(USB_VENDOR_APPLE, 0x8215, 0) },
+
+	/* Apple MacBookPro6,2 */
+	{ USB_VPI(USB_VENDOR_APPLE, 0x8218, 0) },
+
+	/* Apple MacBookAir3,1, MacBookAir3,2 */
+	{ USB_VPI(USB_VENDOR_APPLE, 0x821b, 0) },
+
+	/* Apple MacBookAir4,1 */
+	{ USB_VPI(USB_VENDOR_APPLE, 0x821f, 0) },
+
+	/* MacBookAir6,1 */
+	{ USB_VPI(USB_VENDOR_APPLE, 0x828f, 0) },
+
+	/* Apple MacBookPro8,2 */
+	{ USB_VPI(USB_VENDOR_APPLE, 0x821a, 0) },
+
+	/* Apple MacMini5,1 */
+	{ USB_VPI(USB_VENDOR_APPLE, 0x8281, 0) },
+
+	/* Bluetooth Ultraport Module from IBM */
+	{ USB_VPI(USB_VENDOR_TDK, 0x030a, 0) },
+
+	/* ALPS Modules with non-standard ID */
+	{ USB_VPI(USB_VENDOR_ALPS, 0x3001, 0) },
+	{ USB_VPI(USB_VENDOR_ALPS, 0x3002, 0) },
+
+	{ USB_VPI(USB_VENDOR_ERICSSON2, 0x1002, 0) },
+
+	/* Canyon CN-BTU1 with HID interfaces */
+	{ USB_VPI(USB_VENDOR_CANYON, 0x0000, 0) },
+
+	/* Broadcom BCM20702A0 */
+	{ USB_VPI(USB_VENDOR_ASUS, 0x17b5, 0) },
+	{ USB_VPI(USB_VENDOR_ASUS, 0x17cb, 0) },
+	{ USB_VPI(USB_VENDOR_LITEON, 0x2003, 0) },
+	{ USB_VPI(USB_VENDOR_FOXCONN, 0xe042, 0) },
+	{ USB_VPI(USB_VENDOR_DELL, 0x8197, 0) },
 };
 
 /*