From owner-svn-src-all@FreeBSD.ORG  Fri Apr  5 23:41:41 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 2BEFEDCC;
 Fri,  5 Apr 2013 23:41:40 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E5512296;
 Fri,  5 Apr 2013 23:41:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r35NfeKD054709;
 Fri, 5 Apr 2013 23:41:40 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r35Nfegl054704;
 Fri, 5 Apr 2013 23:41:40 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201304052341.r35Nfegl054704@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Fri, 5 Apr 2013 23:41:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r249178 - head/sys/netgraph/bluetooth/drivers/ubt
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Apr 2013 23:41:41 -0000

Author: adrian
Date: Fri Apr  5 23:41:38 2013
New Revision: 249178
URL: http://svnweb.freebsd.org/changeset/base/249178

Log:
  Add blacklist entries for Atheros bluetooth device IDs that are known to
  need firmware before they will re-attach as correctly functioning bluetooth
  devices.
  
  Reviewed by:	maksim
  Obtained from:	Linux ath3k device driver

Modified:
  head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c

Modified: head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
==============================================================================
--- head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c	Fri Apr  5 23:41:34 2013	(r249177)
+++ head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c	Fri Apr  5 23:41:38 2013	(r249178)
@@ -386,6 +386,39 @@ static const STRUCT_USB_HOST_ID ubt_igno
 {
 	/* AVM USB Bluetooth-Adapter BlueFritz! v1.0 */
 	{ USB_VPI(USB_VENDOR_AVM, 0x2200, 0) },
+
+	/* Atheros 3011 with sflash firmware */
+	{ USB_VPI(0x0cf3, 0x3002, 0) },
+	{ USB_VPI(0x0cf3, 0xe019, 0) },
+	{ USB_VPI(0x13d3, 0x3304, 0) },
+	{ USB_VPI(0x0930, 0x0215, 0) },
+	{ USB_VPI(0x0489, 0xe03d, 0) },
+	{ USB_VPI(0x0489, 0xe027, 0) },
+
+	/* Atheros AR9285 Malbec with sflash firmware */
+	{ USB_VPI(0x03f0, 0x311d, 0) },
+
+	/* Atheros 3012 with sflash firmware */
+	{ USB_VPI(0x0cf3, 0x3004, 0) },
+	{ USB_VPI(0x0cf3, 0x311d, 0) },
+	{ USB_VPI(0x13d3, 0x3375, 0) },
+	{ USB_VPI(0x04ca, 0x3005, 0) },
+	{ USB_VPI(0x04ca, 0x3006, 0) },
+	{ USB_VPI(0x04ca, 0x3008, 0) },
+	{ USB_VPI(0x13d3, 0x3362, 0) },
+	{ USB_VPI(0x0cf3, 0xe004, 0) },
+	{ USB_VPI(0x0930, 0x0219, 0) },
+	{ USB_VPI(0x0489, 0xe057, 0) },
+	{ USB_VPI(0x13d3, 0x3393, 0) },
+	{ USB_VPI(0x0489, 0xe04e, 0) },
+	{ USB_VPI(0x0489, 0xe056, 0) },
+
+	/* Atheros AR5BBU12 with sflash firmware */
+	{ USB_VPI(0x0489, 0xe02c, 0) },
+
+	/* Atheros AR5BBU12 with sflash firmware */
+	{ USB_VPI(0x0489, 0xe03c, 0) },
+	{ USB_VPI(0x0489, 0xe036, 0) },
 };
 
 /* List of supported bluetooth devices */