d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add missing MODULE_VERSION() definitions, this resolves problems around

Browse Source 
duplicate module loads.

PR:		usb/125736
Submitted by:	danger, mm
Reviewed by:	hselasky
This commit is contained in:
thompsa 2010-09-01 23:47:53 +00:00
parent bbb8b57633
commit bb06251a3b
38 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/dev/if_ndis/if_ndis_usb.c
View File

@ -107,6 +107,7 @@ static driver_t ndis_driver = {
static devclass_t ndis_devclass;
DRIVER_MODULE(ndis, uhub, ndis_driver, ndis_devclass, ndisdrv_modevent, 0);
MODULE_VERSION(ndis, 1);
static int
ndisusb_devcompare(interface_type bustype, struct ndis_usb_type *t, device_t dev)

1
sys/dev/usb/input/atp.c
View File

@ -2222,3 +2222,4 @@ static devclass_t atp_devclass;
DRIVER_MODULE(atp, uhub, atp_driver, atp_devclass, NULL, 0);
MODULE_DEPEND(atp, usb, 1, 1, 1);
MODULE_VERSION(atp, 1);

1
sys/dev/usb/input/uep.c
View File

@ -439,3 +439,4 @@ static driver_t uep_driver = {
DRIVER_MODULE(uep, uhub, uep_driver, uep_devclass, NULL, NULL);
MODULE_DEPEND(uep, usb, 1, 1, 1);
MODULE_VERSION(uep, 1);

1
sys/dev/usb/input/uhid.c
View File

@ -801,3 +801,4 @@ static driver_t uhid_driver = {
DRIVER_MODULE(uhid, uhub, uhid_driver, uhid_devclass, NULL, 0);
MODULE_DEPEND(uhid, usb, 1, 1, 1);
MODULE_VERSION(uhid, 1);

1
sys/dev/usb/input/ukbd.c
View File

@ -1887,3 +1887,4 @@ static driver_t ukbd_driver = {
DRIVER_MODULE(ukbd, uhub, ukbd_driver, ukbd_devclass, ukbd_driver_load, 0);
MODULE_DEPEND(ukbd, usb, 1, 1, 1);
MODULE_VERSION(ukbd, 1);

1
sys/dev/usb/input/ums.c
View File

@ -1010,3 +1010,4 @@ static driver_t ums_driver = {
DRIVER_MODULE(ums, uhub, ums_driver, ums_devclass, NULL, 0);
MODULE_DEPEND(ums, usb, 1, 1, 1);
MODULE_VERSION(ums, 1);

1
sys/dev/usb/misc/udbp.c
View File

@ -261,6 +261,7 @@ static driver_t udbp_driver = {
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)

1
sys/dev/usb/misc/ufm.c
View File

@ -117,6 +117,7 @@ static driver_t ufm_driver = {
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)

1
sys/dev/usb/net/if_aue.c
View File

@ -281,6 +281,7 @@ MODULE_DEPEND(aue, uether, 1, 1, 1);
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,

1
sys/dev/usb/net/if_axe.c
View File

@ -256,6 +256,7 @@ MODULE_DEPEND(axe, uether, 1, 1, 1);
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,

1
sys/dev/usb/net/if_cue.c
View File

@ -173,6 +173,7 @@ DRIVER_MODULE(cue, uhub, cue_driver, cue_devclass, NULL, 0);
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,

1
sys/dev/usb/net/if_kue.c
View File

@ -215,6 +215,7 @@ DRIVER_MODULE(kue, uhub, kue_driver, kue_devclass, NULL, 0);
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,

1
sys/dev/usb/net/if_rue.c
View File

@ -213,6 +213,7 @@ MODULE_DEPEND(rue, uether, 1, 1, 1);
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,

1
sys/dev/usb/net/if_udav.c
View File

@ -172,6 +172,7 @@ MODULE_DEPEND(udav, uether, 1, 1, 1);
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,

1
sys/dev/usb/serial/u3g.c
View File

@ -178,6 +178,7 @@ static driver_t u3g_driver = {
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) }

1
sys/dev/usb/serial/uark.c
View File

@ -169,6 +169,7 @@ static driver_t uark_driver = {
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)},

1
sys/dev/usb/serial/ubsa.c
View File

@ -277,6 +277,7 @@ static driver_t ubsa_driver = {
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)

1
sys/dev/usb/serial/ubser.c
View File

@ -215,6 +215,7 @@ static driver_t ubser_driver = {
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)

1
sys/dev/usb/serial/uchcom.c
View File

@ -855,3 +855,4 @@ static devclass_t uchcom_devclass;
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);

1
sys/dev/usb/serial/ucycom.c
View File

@ -176,6 +176,7 @@ static driver_t ucycom_driver = {
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

1
sys/dev/usb/serial/ufoma.c
View File

@ -326,6 +326,7 @@ static driver_t ufoma_driver = {
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)

1
sys/dev/usb/serial/uftdi.c
View File

@ -205,6 +205,7 @@ static driver_t uftdi_driver = {
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) \

1
sys/dev/usb/serial/ugensa.c
View File

@ -153,6 +153,7 @@ static driver_t ugensa_driver = {
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)},

1
sys/dev/usb/serial/uipaq.c
View File

@ -1085,6 +1085,7 @@ static driver_t uipaq_driver = {
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)

1
sys/dev/usb/serial/ulpt.c
View File

@ -745,3 +745,4 @@ static driver_t ulpt_driver = {
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);

1
sys/dev/usb/serial/umct.c
View File

@ -219,6 +219,7 @@ static driver_t umct_driver = {
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)

1
sys/dev/usb/serial/umoscom.c
View File

@ -279,6 +279,7 @@ static driver_t umoscom_driver = {
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)}

1
sys/dev/usb/serial/uvisor.c
View File

@ -252,6 +252,7 @@ static driver_t uvisor_driver = {
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) }

1
sys/dev/usb/storage/umass.c
View File

@ -715,6 +715,7 @@ static driver_t umass_driver = {
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

1
sys/dev/usb/storage/urio.c
View File

@ -197,6 +197,7 @@ static driver_t urio_driver = {
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)

1
sys/dev/usb/usb_compat_linux.c
View File

@ -122,6 +122,7 @@ static driver_t usb_linux_driver = {
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

1
sys/dev/usb/usb_hub.c
View File

@ -170,6 +170,7 @@ static driver_t uhub_driver = {
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)

6
sys/dev/usb/wlan/if_rum.c
View File

@ -139,9 +139,6 @@ static const struct usb_device_id rum_devs[] = {
#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;
@ -2360,3 +2357,6 @@ static driver_t rum_driver = {
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);

8
sys/dev/usb/wlan/if_run.c
View File

@ -294,10 +294,6 @@ static const struct usb_device_id run_devs[] = {
#undef RUN_DEV
};
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;
@ -4871,3 +4867,7 @@ static driver_t run_driver = {
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);

1
sys/dev/usb/wlan/if_uath.c
View File

@ -2892,3 +2892,4 @@ static devclass_t uath_devclass;
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);

1
sys/dev/usb/wlan/if_ural.c
View File

@ -400,6 +400,7 @@ static devclass_t ural_devclass;
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)

1
sys/dev/usb/wlan/if_urtw.c
View File

@ -4441,3 +4441,4 @@ static devclass_t urtw_devclass;
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);

1
sys/dev/usb/wlan/if_zyd.c
View File

@ -2948,3 +2948,4 @@ static devclass_t zyd_devclass;
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);