summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhselasky <hselasky@FreeBSD.org>2013-08-31 06:47:53 +0000
committerhselasky <hselasky@FreeBSD.org>2013-08-31 06:47:53 +0000
commit216f003c2be9f7e38a05306f59bdfc6a15e6d765 (patch)
treecd83f6f14c8c2e3b705792ca25efcbb842cb4e51
parente2d1ad1c47ccca833ace777b7e9ba859916e974e (diff)
downloadFreeBSD-src-216f003c2be9f7e38a05306f59bdfc6a15e6d765.zip
FreeBSD-src-216f003c2be9f7e38a05306f59bdfc6a15e6d765.tar.gz
Sync USB bluetooth product list with Linux.
MFC after: 1 week
-rw-r--r--sys/dev/usb/usbdevs2
-rw-r--r--sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c60
2 files changed, 62 insertions, 0 deletions
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 8dee4f0..498d424 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -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
diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
index b268409..2009cca 100644
--- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
+++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
@@ -437,6 +437,66 @@ 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_LITEON, 0x2003, 0) },
+ { USB_VPI(USB_VENDOR_FOXCONN, 0xe042, 0) },
+ { USB_VPI(USB_VENDOR_DELL, 0x8197, 0) },
};
/*
OpenPOWER on IntegriCloud