diff options
| author | Warner Losh <imp@FreeBSD.org> | 2015-12-11 05:28:00 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2015-12-11 05:28:00 +0000 |
| commit | f809f280e079432b896f3de6f15ca44a7bdab55f (patch) | |
| tree | 53b2b65701b99fe09809fbc71684efc28a02053e /sys/dev/usb/net/if_urndis.c | |
| parent | f6cea53f9db2d88883ea7d7cee5fac10e186650b (diff) | |
| download | src-f809f280e079432b896f3de6f15ca44a7bdab55f.tar.gz src-f809f280e079432b896f3de6f15ca44a7bdab55f.zip | |
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
Notes
Notes:
svn path=/head/; revision=292080
Diffstat (limited to 'sys/dev/usb/net/if_urndis.c')
| -rw-r--r-- | sys/dev/usb/net/if_urndis.c | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/sys/dev/usb/net/if_urndis.c b/sys/dev/usb/net/if_urndis.c index 32fa53370946..749f874c0d94 100644 --- a/sys/dev/usb/net/if_urndis.c +++ b/sys/dev/usb/net/if_urndis.c @@ -161,21 +161,6 @@ static driver_t urndis_driver = { static devclass_t urndis_devclass; -DRIVER_MODULE(urndis, uhub, urndis_driver, urndis_devclass, NULL, NULL); -MODULE_VERSION(urndis, 1); -MODULE_DEPEND(urndis, uether, 1, 1, 1); -MODULE_DEPEND(urndis, usb, 1, 1, 1); -MODULE_DEPEND(urndis, ether, 1, 1, 1); - -static const struct usb_ether_methods urndis_ue_methods = { - .ue_attach_post = urndis_attach_post, - .ue_start = urndis_start, - .ue_init = urndis_init, - .ue_stop = urndis_stop, - .ue_setmulti = urndis_setmulti, - .ue_setpromisc = urndis_setpromisc, -}; - static const STRUCT_USB_HOST_ID urndis_host_devs[] = { /* Generic RNDIS class match */ {USB_IFACE_CLASS(UICLASS_CDC), @@ -191,6 +176,22 @@ static const STRUCT_USB_HOST_ID urndis_host_devs[] = { USB_IFACE_PROTOCOL(0xff)}, }; +DRIVER_MODULE(urndis, uhub, urndis_driver, urndis_devclass, NULL, NULL); +MODULE_VERSION(urndis, 1); +MODULE_DEPEND(urndis, uether, 1, 1, 1); +MODULE_DEPEND(urndis, usb, 1, 1, 1); +MODULE_DEPEND(urndis, ether, 1, 1, 1); +USB_PNP_HOST_INFO(urndis_host_devs); + +static const struct usb_ether_methods urndis_ue_methods = { + .ue_attach_post = urndis_attach_post, + .ue_start = urndis_start, + .ue_init = urndis_init, + .ue_stop = urndis_stop, + .ue_setmulti = urndis_setmulti, + .ue_setpromisc = urndis_setpromisc, +}; + static int urndis_probe(device_t dev) { |