From d1f0e75537b0d494a6823fbcb82d16b517383233 Mon Sep 17 00:00:00 2001
From: imp <imp@FreeBSD.org>
Date: Fri, 25 Jun 2004 23:14:06 +0000
Subject: Remove dependency on dev/usb/usbdevs.h, in preparation for its
 disappearing from the tree.  We already were splitting the baby (using the
 symbol for the vendor BROADCOM, but not for the device).  Use #defines for
 both.

---
 usr.sbin/bluetooth/bcmfw/bcmfw.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'usr.sbin')

diff --git a/usr.sbin/bluetooth/bcmfw/bcmfw.c b/usr.sbin/bluetooth/bcmfw/bcmfw.c
index e21c10c..cd4679d 100644
--- a/usr.sbin/bluetooth/bcmfw/bcmfw.c
+++ b/usr.sbin/bluetooth/bcmfw/bcmfw.c
@@ -35,7 +35,6 @@
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <dev/usb/usb.h>
-#include <dev/usb/usbdevs.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <netgraph.h>
@@ -51,6 +50,9 @@
 #define BCMFW_BULK_EP	2
 #define BCMFW_BSIZE	4096
 
+#define USB_VENDOR_BROADCOM 0x0a5c
+#define USB_PRODUCT_BROADCOM_BCM2033 0x2033
+
 static int bcmfw_check_device
 	(char const *name);
 static int bcmfw_load_firmware
@@ -133,7 +135,7 @@ bcmfw_check_device(char const *name)
 	}
 
 	if (UGETW(desc.idVendor) != USB_VENDOR_BROADCOM ||
-	    UGETW(desc.idProduct) != 0x2033) {
+	    UGETW(desc.idProduct) != USB_PRODUCT_BROADCOM_BCM2033) {
 		syslog(LOG_ERR, "Unsupported device, VendorID=%#x, " \
 				"ProductID=%#x", UGETW(desc.idVendor),
 				UGETW(desc.idProduct));
-- 
cgit v1.1