svn commit: r249389 - in releng/8.4: share/man/man4 sys/netgraph/bluetooth/drivers/ubt

[Raphael Kubo da Costa]

Author: rakuco (ports committer)
Date: Thu Apr 11 22:10:15 2013
New Revision: 249389
URL: http://svnweb.freebsd.org/changeset/base/249389

Log:
  MFS8 r249107:
  Add vendor IDs for Broadcom USB dongles (BCM20702).
  
  PR:		kern/174707
  Approved by:	re (kib), glebius

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

Modified: releng/8.4/share/man/man4/ng_ubt.4
==============================================================================
--- releng/8.4/share/man/man4/ng_ubt.4	Thu Apr 11 22:08:59 2013	(r249388)
+++ releng/8.4/share/man/man4/ng_ubt.4	Thu Apr 11 22:10:15 2013	(r249389)
@@ -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: releng/8.4/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
==============================================================================
--- releng/8.4/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c	Thu Apr 11 22:08:59 2013	(r249388)
+++ releng/8.4/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c	Thu Apr 11 22:10:15 2013	(r249389)
@@ -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 =