summaryrefslogtreecommitdiffstats
path: root/sys/netgraph
diff options
context:
space:
mode:
authorhselasky <hselasky@FreeBSD.org>2011-06-24 02:30:02 +0000
committerhselasky <hselasky@FreeBSD.org>2011-06-24 02:30:02 +0000
commitdc0788739aaaf15b40f6d2fded382c167e26133d (patch)
tree6e82b2865a1b1c3596523a9b28c7c73c29ffd4ec /sys/netgraph
parent1d215b1285ab0897c64a473f1b6b30f0311b87d0 (diff)
downloadFreeBSD-src-dc0788739aaaf15b40f6d2fded382c167e26133d.zip
FreeBSD-src-dc0788739aaaf15b40f6d2fded382c167e26133d.tar.gz
- Move all USB device ID arrays into so-called sections,
sorted according to the mode which they support: host, device or dual mode - Add generic tool to extract these data: tools/bus_autoconf Discussed with: imp Suggested by: Robert Millan <rmh@debian.org> PR: misc/157903 MFC after: 14 days
Diffstat (limited to 'sys/netgraph')
-rw-r--r--sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c4
-rw-r--r--sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
index a13ef4d..d3f8fd3 100644
--- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
+++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
@@ -382,14 +382,14 @@ static const struct usb_config ubt_config[UBT_N_TRANSFER] =
* where VENDOR_ID and PRODUCT_ID are hex numbers.
*/
-static const struct usb_device_id ubt_ignore_devs[] =
+static const STRUCT_USB_HOST_ID ubt_ignore_devs[] =
{
/* AVM USB Bluetooth-Adapter BlueFritz! v1.0 */
{ USB_VPI(USB_VENDOR_AVM, 0x2200, 0) },
};
/* List of supported bluetooth devices */
-static const struct usb_device_id ubt_devs[] =
+static const STRUCT_USB_HOST_ID ubt_devs[] =
{
/* Generic Bluetooth class devices */
{ USB_IFACE_CLASS(UDCLASS_WIRELESS),
diff --git a/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c b/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
index 3d8a05e..da00e05 100644
--- a/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
+++ b/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
@@ -180,7 +180,7 @@ MODULE_DEPEND(ubtbcmfw, usb, 1, 1, 1);
static int
ubtbcmfw_probe(device_t dev)
{
- const struct usb_device_id devs[] = {
+ static const STRUCT_USB_HOST_ID devs[] = {
/* Broadcom BCM2033 devices only */
{ USB_VPI(USB_VENDOR_BROADCOM, USB_PRODUCT_BROADCOM_BCM2033, 0) },
};
OpenPOWER on IntegriCloud