From 70dfad754f4cad4a7b62a683acb963bce99241b8 Mon Sep 17 00:00:00 2001
From: augustss <augustss@NetBSD.org>
Date: Fri, 23 Aug 2002 00:52:45 +0000
Subject: [PATCH] Use separate ids for BCM2033 before and after firmware
 download.

---
 sys/dev/usb/usbdevs        |  5 +++--
 sys/dev/usb/usbdevs.h      |  5 +++--
 sys/dev/usb/usbdevs_data.h | 10 ++++++++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 2cac28b78ebf..e9c91fc8248e 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.270 2002/08/22 02:11:53 augustss Exp $
+$NetBSD: usbdevs,v 1.271 2002/08/23 00:53:33 augustss Exp $
 
 /*
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -491,7 +491,8 @@ product BILLIONTON USBEL100	0x0988	USB100EL
 product BILLIONTON USBE100	0x8511	USBE100
 
 /* Broadcom products */
-product BROADCOM BCM2033	0x2033	BCM2033 Bluetooth adapter
+product BROADCOM BCM2033	0x2000	BCM2033
+product BROADCOM BCM2033NF	0x2033	BCM2033 (no firmware)
 
 /* Brother Industries products */
 product BROTHER HL1050		0x0002	HL-1050 laser printer
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index c5a69b2ff409..a389d2be9593 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: usbdevs.h,v 1.275 2002/08/22 02:12:16 augustss Exp $	*/
+/*	$NetBSD: usbdevs.h,v 1.276 2002/08/23 00:52:45 augustss Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -498,7 +498,8 @@
 #define	USB_PRODUCT_BILLIONTON_USBE100	0x8511		/* USBE100 */
 
 /* Broadcom products */
-#define	USB_PRODUCT_BROADCOM_BCM2033	0x2033		/* BCM2033 Bluetooth adapter */
+#define	USB_PRODUCT_BROADCOM_BCM2033	0x2000		/* BCM2033 */
+#define	USB_PRODUCT_BROADCOM_BCM2033NF	0x2033		/* BCM2033 (no firmware) */
 
 /* Brother Industries products */
 #define	USB_PRODUCT_BROTHER_HL1050	0x0002		/* HL-1050 laser printer */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 1e8c915385d8..3f70a1609e05 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: usbdevs_data.h,v 1.276 2002/08/22 02:12:16 augustss Exp $	*/
+/*	$NetBSD: usbdevs_data.h,v 1.277 2002/08/23 00:52:46 augustss Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -529,7 +529,13 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    USB_VENDOR_BROADCOM, USB_PRODUCT_BROADCOM_BCM2033,
 	    0,
 	    "Broadcom",
-	    "BCM2033 Bluetooth adapter",
+	    "BCM2033",
+	},
+	{
+	    USB_VENDOR_BROADCOM, USB_PRODUCT_BROADCOM_BCM2033NF,
+	    0,
+	    "Broadcom",
+	    "BCM2033 (no firmware)",
 	},
 	{
 	    USB_VENDOR_BROTHER, USB_PRODUCT_BROTHER_HL1050,