Date: Sun, 8 Aug 2010 14:52:09 GMT From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 182088 for review Message-ID: <201008081452.o78Eq9hp013045@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@182088?ac=10 Change 182088 by hselasky@hselasky_laptop001 on 2010/08/08 14:51:16 USB drivers: - add missing MODULE_VERSION() definitions. - this resolves problems around duplicate module loads. PR: usb/125736 Submitted by: danger@ and mm@ Reviewed by: hselasky@ Affected files ... .. //depot/projects/usb/src/sys/dev/usb/input/atp.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/input/uep.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/input/uhid.c#20 edit .. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#51 edit .. //depot/projects/usb/src/sys/dev/usb/input/ums.c#30 edit .. //depot/projects/usb/src/sys/dev/usb/misc/udbp.c#15 edit .. //depot/projects/usb/src/sys/dev/usb/misc/ufm.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/net/if_aue.c#21 edit .. //depot/projects/usb/src/sys/dev/usb/net/if_axe.c#25 edit .. //depot/projects/usb/src/sys/dev/usb/net/if_cue.c#18 edit .. //depot/projects/usb/src/sys/dev/usb/net/if_kue.c#18 edit .. //depot/projects/usb/src/sys/dev/usb/net/if_rue.c#18 edit .. //depot/projects/usb/src/sys/dev/usb/net/if_udav.c#17 edit .. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#33 edit .. //depot/projects/usb/src/sys/dev/usb/serial/uark.c#14 edit .. //depot/projects/usb/src/sys/dev/usb/serial/ubsa.c#15 edit .. //depot/projects/usb/src/sys/dev/usb/serial/ubser.c#20 edit .. //depot/projects/usb/src/sys/dev/usb/serial/uchcom.c#18 edit .. //depot/projects/usb/src/sys/dev/usb/serial/ucycom.c#17 edit .. //depot/projects/usb/src/sys/dev/usb/serial/ufoma.c#16 edit .. //depot/projects/usb/src/sys/dev/usb/serial/uftdi.c#29 edit .. //depot/projects/usb/src/sys/dev/usb/serial/ugensa.c#18 edit .. //depot/projects/usb/src/sys/dev/usb/serial/uipaq.c#20 edit .. //depot/projects/usb/src/sys/dev/usb/serial/ulpt.c#21 edit .. //depot/projects/usb/src/sys/dev/usb/serial/umct.c#20 edit .. //depot/projects/usb/src/sys/dev/usb/serial/umoscom.c#15 edit .. //depot/projects/usb/src/sys/dev/usb/serial/uvisor.c#21 edit .. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#53 edit .. //depot/projects/usb/src/sys/dev/usb/storage/urio.c#18 edit .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#56 edit .. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#55 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#30 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_run.c#17 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_uath.c#23 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_ural.c#24 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_urtw.c#17 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_zyd.c#30 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/input/atp.c#7 (text+ko) ==== @@ -2222,3 +2222,4 @@ DRIVER_MODULE(atp, uhub, atp_driver, atp_devclass, NULL, 0); MODULE_DEPEND(atp, usb, 1, 1, 1); +MODULE_VErSION(atp, 1); ==== //depot/projects/usb/src/sys/dev/usb/input/uep.c#2 (text+ko) ==== @@ -439,3 +439,4 @@ DRIVER_MODULE(uep, uhub, uep_driver, uep_devclass, NULL, NULL); MODULE_DEPEND(uep, usb, 1, 1, 1); +MODULE_VERSION(uep, 1); ==== //depot/projects/usb/src/sys/dev/usb/input/uhid.c#20 (text+ko) ==== @@ -801,3 +801,4 @@ DRIVER_MODULE(uhid, uhub, uhid_driver, uhid_devclass, NULL, 0); MODULE_DEPEND(uhid, usb, 1, 1, 1); +MODULE_VERSION(uhid, 1); ==== //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#51 (text+ko) ==== @@ -1887,3 +1887,4 @@ DRIVER_MODULE(ukbd, uhub, ukbd_driver, ukbd_devclass, ukbd_driver_load, 0); MODULE_DEPEND(ukbd, usb, 1, 1, 1); +MODULE_VERSION(ukbd, 1); ==== //depot/projects/usb/src/sys/dev/usb/input/ums.c#30 (text+ko) ==== @@ -1010,3 +1010,4 @@ DRIVER_MODULE(ums, uhub, ums_driver, ums_devclass, NULL, 0); MODULE_DEPEND(ums, usb, 1, 1, 1); +MODULE_VERSION(ums, 1); ==== //depot/projects/usb/src/sys/dev/usb/misc/udbp.c#15 (text+ko) ==== @@ -261,6 +261,7 @@ DRIVER_MODULE(udbp, uhub, udbp_driver, udbp_devclass, udbp_modload, 0); MODULE_DEPEND(udbp, netgraph, NG_ABI_VERSION, NG_ABI_VERSION, NG_ABI_VERSION); MODULE_DEPEND(udbp, usb, 1, 1, 1); +MODULE_VERSION(udbp, 1); static int udbp_modload(module_t mod, int event, void *data) ==== //depot/projects/usb/src/sys/dev/usb/misc/ufm.c#12 (text+ko) ==== @@ -117,6 +117,7 @@ DRIVER_MODULE(ufm, uhub, ufm_driver, ufm_devclass, NULL, 0); MODULE_DEPEND(ufm, usb, 1, 1, 1); +MODULE_VERSION(ufm, 1); static int ufm_probe(device_t dev) ==== //depot/projects/usb/src/sys/dev/usb/net/if_aue.c#21 (text+ko) ==== @@ -281,6 +281,7 @@ MODULE_DEPEND(aue, usb, 1, 1, 1); MODULE_DEPEND(aue, ether, 1, 1, 1); MODULE_DEPEND(aue, miibus, 1, 1, 1); +MODULE_VERSION(aue, 1); static const struct usb_ether_methods aue_ue_methods = { .ue_attach_post = aue_attach_post, ==== //depot/projects/usb/src/sys/dev/usb/net/if_axe.c#25 (text+ko) ==== @@ -256,6 +256,7 @@ MODULE_DEPEND(axe, usb, 1, 1, 1); MODULE_DEPEND(axe, ether, 1, 1, 1); MODULE_DEPEND(axe, miibus, 1, 1, 1); +MODULE_VERSION(axe, 1); static const struct usb_ether_methods axe_ue_methods = { .ue_attach_post = axe_attach_post, ==== //depot/projects/usb/src/sys/dev/usb/net/if_cue.c#18 (text+ko) ==== @@ -173,6 +173,7 @@ MODULE_DEPEND(cue, uether, 1, 1, 1); MODULE_DEPEND(cue, usb, 1, 1, 1); MODULE_DEPEND(cue, ether, 1, 1, 1); +MODULE_VERSION(cue, 1); static const struct usb_ether_methods cue_ue_methods = { .ue_attach_post = cue_attach_post, ==== //depot/projects/usb/src/sys/dev/usb/net/if_kue.c#18 (text+ko) ==== @@ -215,6 +215,7 @@ MODULE_DEPEND(kue, uether, 1, 1, 1); MODULE_DEPEND(kue, usb, 1, 1, 1); MODULE_DEPEND(kue, ether, 1, 1, 1); +MODULE_VERSION(kue, 1); static const struct usb_ether_methods kue_ue_methods = { .ue_attach_post = kue_attach_post, ==== //depot/projects/usb/src/sys/dev/usb/net/if_rue.c#18 (text+ko) ==== @@ -213,6 +213,7 @@ MODULE_DEPEND(rue, usb, 1, 1, 1); MODULE_DEPEND(rue, ether, 1, 1, 1); MODULE_DEPEND(rue, miibus, 1, 1, 1); +MODULE_VERSION(rue, 1); static const struct usb_ether_methods rue_ue_methods = { .ue_attach_post = rue_attach_post, ==== //depot/projects/usb/src/sys/dev/usb/net/if_udav.c#17 (text+ko) ==== @@ -172,6 +172,7 @@ MODULE_DEPEND(udav, usb, 1, 1, 1); MODULE_DEPEND(udav, ether, 1, 1, 1); MODULE_DEPEND(udav, miibus, 1, 1, 1); +MODULE_VERSION(udav, 1); static const struct usb_ether_methods udav_ue_methods = { .ue_attach_post = udav_attach_post, ==== //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#33 (text+ko) ==== @@ -178,6 +178,7 @@ DRIVER_MODULE(u3g, uhub, u3g_driver, u3g_devclass, u3g_driver_loaded, 0); MODULE_DEPEND(u3g, ucom, 1, 1, 1); MODULE_DEPEND(u3g, usb, 1, 1, 1); +MODULE_VERSION(u3g, 1); static const struct usb_device_id u3g_devs[] = { #define U3G_DEV(v,p,i) { USB_VPI(USB_VENDOR_##v, USB_PRODUCT_##v##_##p, i) } ==== //depot/projects/usb/src/sys/dev/usb/serial/uark.c#14 (text+ko) ==== @@ -169,6 +169,7 @@ DRIVER_MODULE(uark, uhub, uark_driver, uark_devclass, NULL, 0); MODULE_DEPEND(uark, ucom, 1, 1, 1); MODULE_DEPEND(uark, usb, 1, 1, 1); +MODULE_VERSION(uark, 1); static const struct usb_device_id uark_devs[] = { {USB_VPI(USB_VENDOR_ARKMICRO, USB_PRODUCT_ARKMICRO_ARK3116, 0)}, ==== //depot/projects/usb/src/sys/dev/usb/serial/ubsa.c#15 (text+ko) ==== @@ -277,6 +277,7 @@ DRIVER_MODULE(ubsa, uhub, ubsa_driver, ubsa_devclass, NULL, 0); MODULE_DEPEND(ubsa, ucom, 1, 1, 1); MODULE_DEPEND(ubsa, usb, 1, 1, 1); +MODULE_VERSION(ubsa, 1); static int ubsa_probe(device_t dev) ==== //depot/projects/usb/src/sys/dev/usb/serial/ubser.c#20 (text+ko) ==== @@ -214,6 +214,7 @@ DRIVER_MODULE(ubser, uhub, ubser_driver, ubser_devclass, NULL, 0); MODULE_DEPEND(ubser, ucom, 1, 1, 1); MODULE_DEPEND(ubser, usb, 1, 1, 1); +MODULE_VERSION(ubser, 1); static int ubser_probe(device_t dev) ==== //depot/projects/usb/src/sys/dev/usb/serial/uchcom.c#18 (text+ko) ==== @@ -855,3 +855,4 @@ DRIVER_MODULE(uchcom, uhub, uchcom_driver, uchcom_devclass, NULL, 0); MODULE_DEPEND(uchcom, ucom, 1, 1, 1); MODULE_DEPEND(uchcom, usb, 1, 1, 1); +MODULE_VERSION(uchcom, 1); ==== //depot/projects/usb/src/sys/dev/usb/serial/ucycom.c#17 (text+ko) ==== @@ -176,6 +176,7 @@ DRIVER_MODULE(ucycom, uhub, ucycom_driver, ucycom_devclass, NULL, 0); MODULE_DEPEND(ucycom, ucom, 1, 1, 1); MODULE_DEPEND(ucycom, usb, 1, 1, 1); +MODULE_VERSION(ucycom, 1); /* * Supported devices ==== //depot/projects/usb/src/sys/dev/usb/serial/ufoma.c#16 (text+ko) ==== @@ -326,6 +326,7 @@ DRIVER_MODULE(ufoma, uhub, ufoma_driver, ufoma_devclass, NULL, 0); MODULE_DEPEND(ufoma, ucom, 1, 1, 1); MODULE_DEPEND(ufoma, usb, 1, 1, 1); +MODULE_VERSION(ufoma, 1); static int ufoma_probe(device_t dev) ==== //depot/projects/usb/src/sys/dev/usb/serial/uftdi.c#29 (text+ko) ==== @@ -205,6 +205,7 @@ DRIVER_MODULE(uftdi, uhub, uftdi_driver, uftdi_devclass, NULL, 0); MODULE_DEPEND(uftdi, ucom, 1, 1, 1); MODULE_DEPEND(uftdi, usb, 1, 1, 1); +MODULE_VERSION(uftdi, 1); static struct usb_device_id uftdi_devs[] = { #define UFTDI_DEV(v,p,t) \ ==== //depot/projects/usb/src/sys/dev/usb/serial/ugensa.c#18 (text+ko) ==== @@ -153,6 +153,7 @@ DRIVER_MODULE(ugensa, uhub, ugensa_driver, ugensa_devclass, NULL, 0); MODULE_DEPEND(ugensa, ucom, 1, 1, 1); MODULE_DEPEND(ugensa, usb, 1, 1, 1); +MODULE_VERSION(ugensa, 1); static const struct usb_device_id ugensa_devs[] = { {USB_VPI(USB_VENDOR_AIRPRIME, USB_PRODUCT_AIRPRIME_PC5220, 0)}, ==== //depot/projects/usb/src/sys/dev/usb/serial/uipaq.c#20 (text+ko) ==== @@ -1085,6 +1085,7 @@ DRIVER_MODULE(uipaq, uhub, uipaq_driver, uipaq_devclass, NULL, 0); MODULE_DEPEND(uipaq, ucom, 1, 1, 1); MODULE_DEPEND(uipaq, usb, 1, 1, 1); +MODULE_VERSION(uipaq, 1); static int uipaq_probe(device_t dev) ==== //depot/projects/usb/src/sys/dev/usb/serial/ulpt.c#21 (text+ko) ==== @@ -745,3 +745,4 @@ DRIVER_MODULE(ulpt, uhub, ulpt_driver, ulpt_devclass, NULL, 0); MODULE_DEPEND(ulpt, usb, 1, 1, 1); MODULE_DEPEND(ulpt, ucom, 1, 1, 1); +MODULE_VERSION(ulpt, 1); ==== //depot/projects/usb/src/sys/dev/usb/serial/umct.c#20 (text+ko) ==== @@ -219,6 +219,7 @@ DRIVER_MODULE(umct, uhub, umct_driver, umct_devclass, NULL, 0); MODULE_DEPEND(umct, ucom, 1, 1, 1); MODULE_DEPEND(umct, usb, 1, 1, 1); +MODULE_VERSION(umct, 1); static int umct_probe(device_t dev) ==== //depot/projects/usb/src/sys/dev/usb/serial/umoscom.c#15 (text+ko) ==== @@ -279,6 +279,7 @@ DRIVER_MODULE(umoscom, uhub, umoscom_driver, umoscom_devclass, NULL, 0); MODULE_DEPEND(umoscom, ucom, 1, 1, 1); MODULE_DEPEND(umoscom, usb, 1, 1, 1); +MODULE_VERSION(umoscom, 1); static const struct usb_device_id umoscom_devs[] = { {USB_VPI(USB_VENDOR_MOSCHIP, USB_PRODUCT_MOSCHIP_MCS7703, 0)} ==== //depot/projects/usb/src/sys/dev/usb/serial/uvisor.c#21 (text+ko) ==== @@ -252,6 +252,7 @@ DRIVER_MODULE(uvisor, uhub, uvisor_driver, uvisor_devclass, NULL, 0); MODULE_DEPEND(uvisor, ucom, 1, 1, 1); MODULE_DEPEND(uvisor, usb, 1, 1, 1); +MODULE_VERSION(uvisor, 1); static const struct usb_device_id uvisor_devs[] = { #define UVISOR_DEV(v,p,i) { USB_VPI(USB_VENDOR_##v, USB_PRODUCT_##v##_##p, i) } ==== //depot/projects/usb/src/sys/dev/usb/storage/umass.c#53 (text+ko) ==== @@ -715,6 +715,7 @@ DRIVER_MODULE(umass, uhub, umass_driver, umass_devclass, NULL, 0); MODULE_DEPEND(umass, usb, 1, 1, 1); MODULE_DEPEND(umass, cam, 1, 1, 1); +MODULE_VERSION(umass, 1); /* * USB device probe/attach/detach ==== //depot/projects/usb/src/sys/dev/usb/storage/urio.c#18 (text+ko) ==== @@ -197,6 +197,7 @@ DRIVER_MODULE(urio, uhub, urio_driver, urio_devclass, NULL, 0); MODULE_DEPEND(urio, usb, 1, 1, 1); +MODULE_VERSION(urio, 1); static int urio_probe(device_t dev) ==== //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#56 (text+ko) ==== @@ -122,6 +122,7 @@ static devclass_t usb_linux_devclass; DRIVER_MODULE(usb_linux, uhub, usb_linux_driver, usb_linux_devclass, NULL, 0); +MODULE_VERSION(usb_linux, 1); /*------------------------------------------------------------------------* * usb_linux_lookup_id ==== //depot/projects/usb/src/sys/dev/usb/usb_hub.c#55 (text+ko) ==== @@ -172,6 +172,7 @@ DRIVER_MODULE(uhub, usbus, uhub_driver, uhub_devclass, 0, 0); DRIVER_MODULE(uhub, uhub, uhub_driver, uhub_devclass, NULL, 0); +MODULE_VERSION(uhub, 1); static void uhub_intr_callback(struct usb_xfer *xfer, usb_error_t error) ==== //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#30 (text+ko) ==== @@ -139,9 +139,6 @@ #undef RUM_DEV }; -MODULE_DEPEND(rum, wlan, 1, 1, 1); -MODULE_DEPEND(rum, usb, 1, 1, 1); - static device_probe_t rum_match; static device_attach_t rum_attach; static device_detach_t rum_detach; @@ -2364,3 +2361,6 @@ static devclass_t rum_devclass; DRIVER_MODULE(rum, uhub, rum_driver, rum_devclass, NULL, 0); +MODULE_DEPEND(rum, wlan, 1, 1, 1); +MODULE_DEPEND(rum, usb, 1, 1, 1); +MODULE_VERSION(rum, 1); ==== //depot/projects/usb/src/sys/dev/usb/wlan/if_run.c#17 (text+ko) ==== @@ -286,10 +286,6 @@ { USB_VP(USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_RT2870_2) }, }; -MODULE_DEPEND(run, wlan, 1, 1, 1); -MODULE_DEPEND(run, usb, 1, 1, 1); -MODULE_DEPEND(run, firmware, 1, 1, 1); - static device_probe_t run_match; static device_attach_t run_attach; static device_detach_t run_detach; @@ -4950,3 +4946,7 @@ static devclass_t run_devclass; DRIVER_MODULE(run, uhub, run_driver, run_devclass, NULL, 0); +MODULE_DEPEND(run, wlan, 1, 1, 1); +MODULE_DEPEND(run, usb, 1, 1, 1); +MODULE_DEPEND(run, firmware, 1, 1, 1); +MODULE_VERSION(run, 1); ==== //depot/projects/usb/src/sys/dev/usb/wlan/if_uath.c#23 (text+ko) ==== @@ -2921,3 +2921,4 @@ DRIVER_MODULE(uath, uhub, uath_driver, uath_devclass, NULL, 0); MODULE_DEPEND(uath, wlan, 1, 1, 1); MODULE_DEPEND(uath, usb, 1, 1, 1); +MODULE_VERSION(uath, 1); ==== //depot/projects/usb/src/sys/dev/usb/wlan/if_ural.c#24 (text+ko) ==== @@ -400,6 +400,7 @@ DRIVER_MODULE(ural, uhub, ural_driver, ural_devclass, NULL, 0); MODULE_DEPEND(ural, usb, 1, 1, 1); MODULE_DEPEND(ural, wlan, 1, 1, 1); +MODULE_VERSION(ural, 1); static int ural_match(device_t self) ==== //depot/projects/usb/src/sys/dev/usb/wlan/if_urtw.c#17 (text+ko) ==== @@ -4446,3 +4446,4 @@ DRIVER_MODULE(urtw, uhub, urtw_driver, urtw_devclass, NULL, 0); MODULE_DEPEND(urtw, wlan, 1, 1, 1); MODULE_DEPEND(urtw, usb, 1, 1, 1); +MODULE_VERSION(urtw, 1); ==== //depot/projects/usb/src/sys/dev/usb/wlan/if_zyd.c#30 (text+ko) ==== @@ -2955,3 +2955,4 @@ DRIVER_MODULE(zyd, uhub, zyd_driver, zyd_devclass, NULL, 0); MODULE_DEPEND(zyd, usb, 1, 1, 1); MODULE_DEPEND(zyd, wlan, 1, 1, 1); +MODULE_VERSION(zyd, 1);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008081452.o78Eq9hp013045>