svn commit: r244956 - in stable/9: share/man/man4 sys/netgraph/bluetooth/drivers/ubt

[Hans Petter Selasky]

Author: hselasky
Date: Wed Jan  2 07:33:19 2013
New Revision: 244956
URL: http://svnweb.freebsd.org/changeset/base/244956

Log:
  MFC r244704, r244714 and r244715:
  Add vendor IDs for Broadcom USB dongles (BCM20702).
  
  PR:		kern/174707

Modified:
  stable/9/share/man/man4/ng_ubt.4
  stable/9/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
Directory Properties:
  stable/9/share/   (props changed)
  stable/9/share/man/   (props changed)
  stable/9/share/man/man4/   (props changed)
  stable/9/sys/   (props changed)

Modified: stable/9/share/man/man4/ng_ubt.4
==============================================================================
--- stable/9/share/man/man4/ng_ubt.4	Wed Jan  2 04:29:35 2013	(r244955)
+++ stable/9/share/man/man4/ng_ubt.4	Wed Jan  2 07:33:19 2013	(r244956)
@@ -25,7 +25,7 @@
 .\" $Id: ng_ubt.4,v 1.3 2003/05/21 19:37:35 max Exp $
 .\" $FreeBSD$
 .\"
-.Dd September 13, 2004
+.Dd December 26, 2012
 .Dt NG_UBT 4
 .Os
 .Sh NAME
@@ -73,6 +73,8 @@ Mitsumi Bluetooth USB adapter
 MSI MS-6967
 .It
 TDK Bluetooth USB adapter
+.It
+Broadcom Bluetooth USB adapter
 .El
 .Sh HOOKS
 This node type supports the following hooks:

Modified: stable/9/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
==============================================================================
--- stable/9/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c	Wed Jan  2 04:29:35 2013	(r244955)
+++ stable/9/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c	Wed Jan  2 07:33:19 2013	(r244956)
@@ -398,6 +398,12 @@ static const STRUCT_USB_HOST_ID ubt_devs
 
 	/* AVM USB Bluetooth-Adapter BlueFritz! v2.0 */
 	{ USB_VPI(USB_VENDOR_AVM, 0x3800, 0) },
+
+	/* Broadcom USB dongles, mostly BCM20702 and BCM20702A0 */
+	{ USB_VENDOR(USB_VENDOR_BROADCOM),
+	  USB_IFACE_CLASS(UICLASS_VENDOR),
+	  USB_IFACE_SUBCLASS(UDSUBCLASS_RF),
+	  USB_IFACE_PROTOCOL(UDPROTO_BLUETOOTH) },
 };
 
 /*
@@ -1748,7 +1754,7 @@ static device_method_t	ubt_methods[] =
 	DEVMETHOD(device_probe,	ubt_probe),
 	DEVMETHOD(device_attach, ubt_attach),
 	DEVMETHOD(device_detach, ubt_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t		ubt_driver =