summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb/serial/uftdi.c
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2015-12-11 05:28:00 +0000
committerimp <imp@FreeBSD.org>2015-12-11 05:28:00 +0000
commit372c4744b653cb538ad633af447e0f62791de9aa (patch)
tree53b2b65701b99fe09809fbc71684efc28a02053e /sys/dev/usb/serial/uftdi.c
parent77eac42e70f63160d6d267a51a880c804e5b20e7 (diff)
downloadFreeBSD-src-372c4744b653cb538ad633af447e0f62791de9aa.zip
FreeBSD-src-372c4744b653cb538ad633af447e0f62791de9aa.tar.gz
Create a USB_PNP_INFO and use it to export the existing PNP
tables. Some drivers needed some slight re-arrangement of declarations to accommodate this. Change the USB pnp tables slightly to allow better compatibility with the system by moving linux driver info from start of each entry to the end. All other PNP tables in the system have the per-device flags and such at the end of the elements rather that at the beginning. Differential Review: https://reviews.freebsd.org/D3458
Diffstat (limited to 'sys/dev/usb/serial/uftdi.c')
-rw-r--r--sys/dev/usb/serial/uftdi.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/dev/usb/serial/uftdi.c b/sys/dev/usb/serial/uftdi.c
index b33df36..936d7f0 100644
--- a/sys/dev/usb/serial/uftdi.c
+++ b/sys/dev/usb/serial/uftdi.c
@@ -265,11 +265,6 @@ static driver_t uftdi_driver = {
.size = sizeof(struct uftdi_softc),
};
-DRIVER_MODULE(uftdi, uhub, uftdi_driver, uftdi_devclass, NULL, NULL);
-MODULE_DEPEND(uftdi, ucom, 1, 1, 1);
-MODULE_DEPEND(uftdi, usb, 1, 1, 1);
-MODULE_VERSION(uftdi, 1);
-
static const STRUCT_USB_HOST_ID uftdi_devs[] = {
#define UFTDI_DEV(v, p, i) \
{ USB_VPI(USB_VENDOR_##v, USB_PRODUCT_##v##_##p, i) }
@@ -914,6 +909,12 @@ static const STRUCT_USB_HOST_ID uftdi_devs[] = {
#undef UFTDI_DEV
};
+DRIVER_MODULE(uftdi, uhub, uftdi_driver, uftdi_devclass, NULL, NULL);
+MODULE_DEPEND(uftdi, ucom, 1, 1, 1);
+MODULE_DEPEND(uftdi, usb, 1, 1, 1);
+MODULE_VERSION(uftdi, 1);
+USB_PNP_HOST_INFO(uftdi_devs);
+
/*
* Jtag product name strings table. Some products have one or more interfaces
* dedicated to jtag or gpio, but use a product ID that's the same as other
OpenPOWER on IntegriCloud