svn commit: r189275 - in head/sys/dev: ata sound/usb usb
usb/bluetooth usb/image usb/input usb/misc usb/net usb/serial
usb/storage usb/wlan
Andrew Thompson
thompsa at FreeBSD.org
Sun Mar 1 21:37:08 PST 2009
Author: thompsa
Date: Mon Mar 2 05:37:05 2009
New Revision: 189275
URL: http://svn.freebsd.org/changeset/base/189275
Log:
Rename the ushub device class back to uhub as it was in the old usb stack,
moused(8) looks for "uhub/ums" to decide if needs to load the module.
Reported by: Garrett Cooper
Modified:
head/sys/dev/ata/ata-usb.c
head/sys/dev/sound/usb/uaudio.c
head/sys/dev/usb/bluetooth/ng_ubt.c
head/sys/dev/usb/bluetooth/ubtbcmfw.c
head/sys/dev/usb/image/uscanner.c
head/sys/dev/usb/input/uhid.c
head/sys/dev/usb/input/ukbd.c
head/sys/dev/usb/input/ums.c
head/sys/dev/usb/misc/udbp.c
head/sys/dev/usb/misc/ufm.c
head/sys/dev/usb/net/if_aue.c
head/sys/dev/usb/net/if_axe.c
head/sys/dev/usb/net/if_cdce.c
head/sys/dev/usb/net/if_cue.c
head/sys/dev/usb/net/if_kue.c
head/sys/dev/usb/net/if_rue.c
head/sys/dev/usb/net/if_udav.c
head/sys/dev/usb/serial/u3g.c
head/sys/dev/usb/serial/uark.c
head/sys/dev/usb/serial/ubsa.c
head/sys/dev/usb/serial/ubser.c
head/sys/dev/usb/serial/uchcom.c
head/sys/dev/usb/serial/ucycom.c
head/sys/dev/usb/serial/ufoma.c
head/sys/dev/usb/serial/uftdi.c
head/sys/dev/usb/serial/ugensa.c
head/sys/dev/usb/serial/uipaq.c
head/sys/dev/usb/serial/ulpt.c
head/sys/dev/usb/serial/umct.c
head/sys/dev/usb/serial/umodem.c
head/sys/dev/usb/serial/umoscom.c
head/sys/dev/usb/serial/uplcom.c
head/sys/dev/usb/serial/uslcom.c
head/sys/dev/usb/serial/uvisor.c
head/sys/dev/usb/serial/uvscom.c
head/sys/dev/usb/storage/umass.c
head/sys/dev/usb/storage/urio.c
head/sys/dev/usb/storage/ustorage_fs.c
head/sys/dev/usb/usb_compat_linux.c
head/sys/dev/usb/usb_hub.c
head/sys/dev/usb/wlan/if_rum.c
head/sys/dev/usb/wlan/if_ural.c
head/sys/dev/usb/wlan/if_zyd.c
Modified: head/sys/dev/ata/ata-usb.c
==============================================================================
--- head/sys/dev/ata/ata-usb.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/ata/ata-usb.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -271,7 +271,7 @@ static driver_t atausb2_driver = {
.size = sizeof(struct atausb2_softc),
};
-DRIVER_MODULE(atausb, ushub, atausb2_driver, atausb2_devclass, 0, 0);
+DRIVER_MODULE(atausb, uhub, atausb2_driver, atausb2_devclass, 0, 0);
MODULE_DEPEND(atausb, usb, 1, 1, 1);
MODULE_VERSION(atausb, 1);
Modified: head/sys/dev/sound/usb/uaudio.c
==============================================================================
--- head/sys/dev/sound/usb/uaudio.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/sound/usb/uaudio.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -3742,7 +3742,7 @@ umidi_detach(device_t dev)
return (0);
}
-DRIVER_MODULE(uaudio, ushub, uaudio_driver, uaudio_devclass, NULL, 0);
+DRIVER_MODULE(uaudio, uhub, uaudio_driver, uaudio_devclass, NULL, 0);
MODULE_DEPEND(uaudio, usb, 1, 1, 1);
MODULE_DEPEND(uaudio, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
MODULE_VERSION(uaudio, 1);
Modified: head/sys/dev/usb/bluetooth/ng_ubt.c
==============================================================================
--- head/sys/dev/usb/bluetooth/ng_ubt.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/bluetooth/ng_ubt.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -1710,7 +1710,7 @@ static driver_t ubt_driver =
.size = sizeof(struct ubt_softc),
};
-DRIVER_MODULE(ng_ubt, ushub, ubt_driver, ubt_devclass, ubt_modevent, 0);
+DRIVER_MODULE(ng_ubt, uhub, ubt_driver, ubt_devclass, ubt_modevent, 0);
MODULE_VERSION(ng_ubt, NG_BLUETOOTH_VERSION);
MODULE_DEPEND(ng_ubt, netgraph, NG_ABI_VERSION, NG_ABI_VERSION, NG_ABI_VERSION);
MODULE_DEPEND(ng_ubt, ng_hci, NG_BLUETOOTH_VERSION, NG_BLUETOOTH_VERSION, NG_BLUETOOTH_VERSION);
Modified: head/sys/dev/usb/bluetooth/ubtbcmfw.c
==============================================================================
--- head/sys/dev/usb/bluetooth/ubtbcmfw.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/bluetooth/ubtbcmfw.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -157,7 +157,7 @@ static driver_t ubtbcmfw_driver =
.size = sizeof(struct ubtbcmfw_softc),
};
-DRIVER_MODULE(ubtbcmfw, ushub, ubtbcmfw_driver, ubtbcmfw_devclass, NULL, 0);
+DRIVER_MODULE(ubtbcmfw, uhub, ubtbcmfw_driver, ubtbcmfw_devclass, NULL, 0);
MODULE_DEPEND(ubtbcmfw, usb, 1, 1, 1);
/*
Modified: head/sys/dev/usb/image/uscanner.c
==============================================================================
--- head/sys/dev/usb/image/uscanner.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/image/uscanner.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -200,7 +200,7 @@ static driver_t uscanner_driver = {
.size = sizeof(struct uscanner_softc),
};
-DRIVER_MODULE(uscanner, ushub, uscanner_driver, uscanner_devclass, NULL, 0);
+DRIVER_MODULE(uscanner, uhub, uscanner_driver, uscanner_devclass, NULL, 0);
MODULE_DEPEND(uscanner, usb, 1, 1, 1);
/*
Modified: head/sys/dev/usb/input/uhid.c
==============================================================================
--- head/sys/dev/usb/input/uhid.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/input/uhid.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -783,5 +783,5 @@ static driver_t uhid_driver = {
.size = sizeof(struct uhid_softc),
};
-DRIVER_MODULE(uhid, ushub, uhid_driver, uhid_devclass, NULL, 0);
+DRIVER_MODULE(uhid, uhub, uhid_driver, uhid_devclass, NULL, 0);
MODULE_DEPEND(uhid, usb, 1, 1, 1);
Modified: head/sys/dev/usb/input/ukbd.c
==============================================================================
--- head/sys/dev/usb/input/ukbd.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/input/ukbd.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -1485,5 +1485,5 @@ static driver_t ukbd_driver = {
.size = sizeof(struct ukbd_softc),
};
-DRIVER_MODULE(ukbd, ushub, ukbd_driver, ukbd_devclass, ukbd_driver_load, 0);
+DRIVER_MODULE(ukbd, uhub, ukbd_driver, ukbd_devclass, ukbd_driver_load, 0);
MODULE_DEPEND(ukbd, usb, 1, 1, 1);
Modified: head/sys/dev/usb/input/ums.c
==============================================================================
--- head/sys/dev/usb/input/ums.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/input/ums.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -858,5 +858,5 @@ static driver_t ums_driver = {
.size = sizeof(struct ums_softc),
};
-DRIVER_MODULE(ums, ushub, ums_driver, ums_devclass, NULL, 0);
+DRIVER_MODULE(ums, uhub, ums_driver, ums_devclass, NULL, 0);
MODULE_DEPEND(ums, usb, 1, 1, 1);
Modified: head/sys/dev/usb/misc/udbp.c
==============================================================================
--- head/sys/dev/usb/misc/udbp.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/misc/udbp.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -246,7 +246,7 @@ static driver_t udbp_driver = {
.size = sizeof(struct udbp_softc),
};
-DRIVER_MODULE(udbp, ushub, udbp_driver, udbp_devclass, udbp_modload, 0);
+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);
Modified: head/sys/dev/usb/misc/ufm.c
==============================================================================
--- head/sys/dev/usb/misc/ufm.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/misc/ufm.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -104,7 +104,7 @@ static driver_t ufm_driver = {
.size = sizeof(struct ufm_softc),
};
-DRIVER_MODULE(ufm, ushub, ufm_driver, ufm_devclass, NULL, 0);
+DRIVER_MODULE(ufm, uhub, ufm_driver, ufm_devclass, NULL, 0);
MODULE_DEPEND(ufm, usb, 1, 1, 1);
static int
Modified: head/sys/dev/usb/net/if_aue.c
==============================================================================
--- head/sys/dev/usb/net/if_aue.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/net/if_aue.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -261,7 +261,7 @@ static driver_t aue_driver = {
static devclass_t aue_devclass;
-DRIVER_MODULE(aue, ushub, aue_driver, aue_devclass, NULL, 0);
+DRIVER_MODULE(aue, uhub, aue_driver, aue_devclass, NULL, 0);
DRIVER_MODULE(miibus, aue, miibus_driver, miibus_devclass, 0, 0);
MODULE_DEPEND(aue, uether, 1, 1, 1);
MODULE_DEPEND(aue, usb, 1, 1, 1);
Modified: head/sys/dev/usb/net/if_axe.c
==============================================================================
--- head/sys/dev/usb/net/if_axe.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/net/if_axe.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -238,7 +238,7 @@ static driver_t axe_driver = {
static devclass_t axe_devclass;
-DRIVER_MODULE(axe, ushub, axe_driver, axe_devclass, NULL, 0);
+DRIVER_MODULE(axe, uhub, axe_driver, axe_devclass, NULL, 0);
DRIVER_MODULE(miibus, axe, miibus_driver, miibus_devclass, 0, 0);
MODULE_DEPEND(axe, uether, 1, 1, 1);
MODULE_DEPEND(axe, usb, 1, 1, 1);
Modified: head/sys/dev/usb/net/if_cdce.c
==============================================================================
--- head/sys/dev/usb/net/if_cdce.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/net/if_cdce.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -176,7 +176,7 @@ static driver_t cdce_driver = {
static devclass_t cdce_devclass;
-DRIVER_MODULE(cdce, ushub, cdce_driver, cdce_devclass, NULL, 0);
+DRIVER_MODULE(cdce, uhub, cdce_driver, cdce_devclass, NULL, 0);
MODULE_VERSION(cdce, 1);
MODULE_DEPEND(cdce, uether, 1, 1, 1);
MODULE_DEPEND(cdce, usb, 1, 1, 1);
Modified: head/sys/dev/usb/net/if_cue.c
==============================================================================
--- head/sys/dev/usb/net/if_cue.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/net/if_cue.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -155,7 +155,7 @@ static driver_t cue_driver = {
static devclass_t cue_devclass;
-DRIVER_MODULE(cue, ushub, cue_driver, cue_devclass, NULL, 0);
+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);
Modified: head/sys/dev/usb/net/if_kue.c
==============================================================================
--- head/sys/dev/usb/net/if_kue.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/net/if_kue.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -198,7 +198,7 @@ static driver_t kue_driver = {
static devclass_t kue_devclass;
-DRIVER_MODULE(kue, ushub, kue_driver, kue_devclass, NULL, 0);
+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);
Modified: head/sys/dev/usb/net/if_rue.c
==============================================================================
--- head/sys/dev/usb/net/if_rue.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/net/if_rue.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -194,7 +194,7 @@ static driver_t rue_driver = {
static devclass_t rue_devclass;
-DRIVER_MODULE(rue, ushub, rue_driver, rue_devclass, NULL, 0);
+DRIVER_MODULE(rue, uhub, rue_driver, rue_devclass, NULL, 0);
DRIVER_MODULE(miibus, rue, miibus_driver, miibus_devclass, 0, 0);
MODULE_DEPEND(rue, uether, 1, 1, 1);
MODULE_DEPEND(rue, usb, 1, 1, 1);
Modified: head/sys/dev/usb/net/if_udav.c
==============================================================================
--- head/sys/dev/usb/net/if_udav.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/net/if_udav.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -154,7 +154,7 @@ static driver_t udav_driver = {
static devclass_t udav_devclass;
-DRIVER_MODULE(udav, ushub, udav_driver, udav_devclass, NULL, 0);
+DRIVER_MODULE(udav, uhub, udav_driver, udav_devclass, NULL, 0);
DRIVER_MODULE(miibus, udav, miibus_driver, miibus_devclass, 0, 0);
MODULE_DEPEND(udav, uether, 1, 1, 1);
MODULE_DEPEND(udav, usb, 1, 1, 1);
Modified: head/sys/dev/usb/serial/u3g.c
==============================================================================
--- head/sys/dev/usb/serial/u3g.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/serial/u3g.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -154,7 +154,7 @@ static driver_t u3g_driver = {
.size = sizeof(struct u3g_softc),
};
-DRIVER_MODULE(u3g, ushub, u3g_driver, u3g_devclass, u3g_driver_loaded, 0);
+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);
Modified: head/sys/dev/usb/serial/uark.c
==============================================================================
--- head/sys/dev/usb/serial/uark.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/serial/uark.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -148,7 +148,7 @@ static driver_t uark_driver = {
.size = sizeof(struct uark_softc),
};
-DRIVER_MODULE(uark, ushub, uark_driver, uark_devclass, NULL, 0);
+DRIVER_MODULE(uark, uhub, uark_driver, uark_devclass, NULL, 0);
MODULE_DEPEND(uark, ucom, 1, 1, 1);
MODULE_DEPEND(uark, usb, 1, 1, 1);
Modified: head/sys/dev/usb/serial/ubsa.c
==============================================================================
--- head/sys/dev/usb/serial/ubsa.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/serial/ubsa.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -259,7 +259,7 @@ static driver_t ubsa_driver = {
.size = sizeof(struct ubsa_softc),
};
-DRIVER_MODULE(ubsa, ushub, ubsa_driver, ubsa_devclass, NULL, 0);
+DRIVER_MODULE(ubsa, uhub, ubsa_driver, ubsa_devclass, NULL, 0);
MODULE_DEPEND(ubsa, ucom, 1, 1, 1);
MODULE_DEPEND(ubsa, usb, 1, 1, 1);
Modified: head/sys/dev/usb/serial/ubser.c
==============================================================================
--- head/sys/dev/usb/serial/ubser.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/serial/ubser.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -197,7 +197,7 @@ static driver_t ubser_driver = {
.size = sizeof(struct ubser_softc),
};
-DRIVER_MODULE(ubser, ushub, ubser_driver, ubser_devclass, NULL, 0);
+DRIVER_MODULE(ubser, uhub, ubser_driver, ubser_devclass, NULL, 0);
MODULE_DEPEND(ubser, ucom, 1, 1, 1);
MODULE_DEPEND(ubser, usb, 1, 1, 1);
Modified: head/sys/dev/usb/serial/uchcom.c
==============================================================================
--- head/sys/dev/usb/serial/uchcom.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/serial/uchcom.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -882,6 +882,6 @@ static driver_t uchcom_driver = {
static devclass_t uchcom_devclass;
-DRIVER_MODULE(uchcom, ushub, uchcom_driver, uchcom_devclass, NULL, 0);
+DRIVER_MODULE(uchcom, uhub, uchcom_driver, uchcom_devclass, NULL, 0);
MODULE_DEPEND(uchcom, ucom, 1, 1, 1);
MODULE_DEPEND(uchcom, usb, 1, 1, 1);
Modified: head/sys/dev/usb/serial/ucycom.c
==============================================================================
--- head/sys/dev/usb/serial/ucycom.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/serial/ucycom.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -161,7 +161,7 @@ static driver_t ucycom_driver = {
.size = sizeof(struct ucycom_softc),
};
-DRIVER_MODULE(ucycom, ushub, ucycom_driver, ucycom_devclass, NULL, 0);
+DRIVER_MODULE(ucycom, uhub, ucycom_driver, ucycom_devclass, NULL, 0);
MODULE_DEPEND(ucycom, ucom, 1, 1, 1);
MODULE_DEPEND(ucycom, usb, 1, 1, 1);
Modified: head/sys/dev/usb/serial/ufoma.c
==============================================================================
--- head/sys/dev/usb/serial/ufoma.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/serial/ufoma.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -311,7 +311,7 @@ static driver_t ufoma_driver = {
.size = sizeof(struct ufoma_softc),
};
-DRIVER_MODULE(ufoma, ushub, ufoma_driver, ufoma_devclass, NULL, 0);
+DRIVER_MODULE(ufoma, uhub, ufoma_driver, ufoma_devclass, NULL, 0);
MODULE_DEPEND(ufoma, ucom, 1, 1, 1);
MODULE_DEPEND(ufoma, usb, 1, 1, 1);
Modified: head/sys/dev/usb/serial/uftdi.c
==============================================================================
--- head/sys/dev/usb/serial/uftdi.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/serial/uftdi.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -196,7 +196,7 @@ static driver_t uftdi_driver = {
.size = sizeof(struct uftdi_softc),
};
-DRIVER_MODULE(uftdi, ushub, uftdi_driver, uftdi_devclass, NULL, 0);
+DRIVER_MODULE(uftdi, uhub, uftdi_driver, uftdi_devclass, NULL, 0);
MODULE_DEPEND(uftdi, ucom, 1, 1, 1);
MODULE_DEPEND(uftdi, usb, 1, 1, 1);
Modified: head/sys/dev/usb/serial/ugensa.c
==============================================================================
--- head/sys/dev/usb/serial/ugensa.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/serial/ugensa.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -145,7 +145,7 @@ static driver_t ugensa_driver = {
.size = sizeof(struct ugensa_softc),
};
-DRIVER_MODULE(ugensa, ushub, ugensa_driver, ugensa_devclass, NULL, 0);
+DRIVER_MODULE(ugensa, uhub, ugensa_driver, ugensa_devclass, NULL, 0);
MODULE_DEPEND(ugensa, ucom, 1, 1, 1);
MODULE_DEPEND(ugensa, usb, 1, 1, 1);
Modified: head/sys/dev/usb/serial/uipaq.c
==============================================================================
--- head/sys/dev/usb/serial/uipaq.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/serial/uipaq.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -1069,7 +1069,7 @@ static driver_t uipaq_driver = {
.size = sizeof(struct uipaq_softc),
};
-DRIVER_MODULE(uipaq, ushub, uipaq_driver, uipaq_devclass, NULL, 0);
+DRIVER_MODULE(uipaq, uhub, uipaq_driver, uipaq_devclass, NULL, 0);
MODULE_DEPEND(uipaq, ucom, 1, 1, 1);
MODULE_DEPEND(uipaq, usb, 1, 1, 1);
Modified: head/sys/dev/usb/serial/ulpt.c
==============================================================================
--- head/sys/dev/usb/serial/ulpt.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/serial/ulpt.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -717,6 +717,6 @@ static driver_t ulpt_driver = {
.size = sizeof(struct ulpt_softc),
};
-DRIVER_MODULE(ulpt, ushub, ulpt_driver, ulpt_devclass, NULL, 0);
+DRIVER_MODULE(ulpt, uhub, ulpt_driver, ulpt_devclass, NULL, 0);
MODULE_DEPEND(ulpt, usb, 1, 1, 1);
MODULE_DEPEND(ulpt, ucom, 1, 1, 1);
Modified: head/sys/dev/usb/serial/umct.c
==============================================================================
--- head/sys/dev/usb/serial/umct.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/serial/umct.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -200,7 +200,7 @@ static driver_t umct_driver = {
.size = sizeof(struct umct_softc),
};
-DRIVER_MODULE(umct, ushub, umct_driver, umct_devclass, NULL, 0);
+DRIVER_MODULE(umct, uhub, umct_driver, umct_devclass, NULL, 0);
MODULE_DEPEND(umct, ucom, 1, 1, 1);
MODULE_DEPEND(umct, usb, 1, 1, 1);
Modified: head/sys/dev/usb/serial/umodem.c
==============================================================================
--- head/sys/dev/usb/serial/umodem.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/serial/umodem.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -244,7 +244,7 @@ static driver_t umodem_driver = {
.size = sizeof(struct umodem_softc),
};
-DRIVER_MODULE(umodem, ushub, umodem_driver, umodem_devclass, NULL, 0);
+DRIVER_MODULE(umodem, uhub, umodem_driver, umodem_devclass, NULL, 0);
MODULE_DEPEND(umodem, ucom, 1, 1, 1);
MODULE_DEPEND(umodem, usb, 1, 1, 1);
MODULE_VERSION(umodem, UMODEM_MODVER);
Modified: head/sys/dev/usb/serial/umoscom.c
==============================================================================
--- head/sys/dev/usb/serial/umoscom.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/serial/umoscom.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -261,7 +261,7 @@ static driver_t umoscom_driver = {
.size = sizeof(struct umoscom_softc),
};
-DRIVER_MODULE(umoscom, ushub, umoscom_driver, umoscom_devclass, NULL, 0);
+DRIVER_MODULE(umoscom, uhub, umoscom_driver, umoscom_devclass, NULL, 0);
MODULE_DEPEND(umoscom, ucom, 1, 1, 1);
MODULE_DEPEND(umoscom, usb, 1, 1, 1);
Modified: head/sys/dev/usb/serial/uplcom.c
==============================================================================
--- head/sys/dev/usb/serial/uplcom.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/serial/uplcom.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -291,7 +291,7 @@ static driver_t uplcom_driver = {
.size = sizeof(struct uplcom_softc),
};
-DRIVER_MODULE(uplcom, ushub, uplcom_driver, uplcom_devclass, NULL, 0);
+DRIVER_MODULE(uplcom, uhub, uplcom_driver, uplcom_devclass, NULL, 0);
MODULE_DEPEND(uplcom, ucom, 1, 1, 1);
MODULE_DEPEND(uplcom, usb, 1, 1, 1);
MODULE_VERSION(uplcom, UPLCOM_MODVER);
Modified: head/sys/dev/usb/serial/uslcom.c
==============================================================================
--- head/sys/dev/usb/serial/uslcom.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/serial/uslcom.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -194,7 +194,7 @@ static driver_t uslcom_driver = {
.size = sizeof(struct uslcom_softc),
};
-DRIVER_MODULE(uslcom, ushub, uslcom_driver, uslcom_devclass, NULL, 0);
+DRIVER_MODULE(uslcom, uhub, uslcom_driver, uslcom_devclass, NULL, 0);
MODULE_DEPEND(uslcom, ucom, 1, 1, 1);
MODULE_DEPEND(uslcom, usb, 1, 1, 1);
MODULE_VERSION(uslcom, 1);
Modified: head/sys/dev/usb/serial/uvisor.c
==============================================================================
--- head/sys/dev/usb/serial/uvisor.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/serial/uvisor.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -235,7 +235,7 @@ static driver_t uvisor_driver = {
.size = sizeof(struct uvisor_softc),
};
-DRIVER_MODULE(uvisor, ushub, uvisor_driver, uvisor_devclass, NULL, 0);
+DRIVER_MODULE(uvisor, uhub, uvisor_driver, uvisor_devclass, NULL, 0);
MODULE_DEPEND(uvisor, ucom, 1, 1, 1);
MODULE_DEPEND(uvisor, usb, 1, 1, 1);
Modified: head/sys/dev/usb/serial/uvscom.c
==============================================================================
--- head/sys/dev/usb/serial/uvscom.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/serial/uvscom.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -247,7 +247,7 @@ static driver_t uvscom_driver = {
.size = sizeof(struct uvscom_softc),
};
-DRIVER_MODULE(uvscom, ushub, uvscom_driver, uvscom_devclass, NULL, 0);
+DRIVER_MODULE(uvscom, uhub, uvscom_driver, uvscom_devclass, NULL, 0);
MODULE_DEPEND(uvscom, ucom, 1, 1, 1);
MODULE_DEPEND(uvscom, usb, 1, 1, 1);
MODULE_VERSION(uvscom, UVSCOM_MODVER);
Modified: head/sys/dev/usb/storage/umass.c
==============================================================================
--- head/sys/dev/usb/storage/umass.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/storage/umass.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -1281,7 +1281,7 @@ static driver_t umass_driver = {
.size = sizeof(struct umass_softc),
};
-DRIVER_MODULE(umass, ushub, umass_driver, umass_devclass, NULL, 0);
+DRIVER_MODULE(umass, uhub, umass_driver, umass_devclass, NULL, 0);
MODULE_DEPEND(umass, usb, 1, 1, 1);
MODULE_DEPEND(umass, cam, 1, 1, 1);
Modified: head/sys/dev/usb/storage/urio.c
==============================================================================
--- head/sys/dev/usb/storage/urio.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/storage/urio.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -183,7 +183,7 @@ static driver_t urio_driver = {
.size = sizeof(struct urio_softc),
};
-DRIVER_MODULE(urio, ushub, urio_driver, urio_devclass, NULL, 0);
+DRIVER_MODULE(urio, uhub, urio_driver, urio_devclass, NULL, 0);
MODULE_DEPEND(urio, usb, 1, 1, 1);
static int
Modified: head/sys/dev/usb/storage/ustorage_fs.c
==============================================================================
--- head/sys/dev/usb/storage/ustorage_fs.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/storage/ustorage_fs.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -229,7 +229,7 @@ static driver_t ustorage_fs_driver = {
static devclass_t ustorage_fs_devclass;
-DRIVER_MODULE(ustorage_fs, ushub, ustorage_fs_driver, ustorage_fs_devclass, NULL, 0);
+DRIVER_MODULE(ustorage_fs, uhub, ustorage_fs_driver, ustorage_fs_devclass, NULL, 0);
MODULE_VERSION(ustorage_fs, 0);
MODULE_DEPEND(ustorage_fs, usb, 1, 1, 1);
Modified: head/sys/dev/usb/usb_compat_linux.c
==============================================================================
--- head/sys/dev/usb/usb_compat_linux.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/usb_compat_linux.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -106,7 +106,7 @@ static driver_t usb_linux_driver = {
static devclass_t usb_linux_devclass;
-DRIVER_MODULE(usb_linux, ushub, usb_linux_driver, usb_linux_devclass, NULL, 0);
+DRIVER_MODULE(usb_linux, uhub, usb_linux_driver, usb_linux_devclass, NULL, 0);
/*------------------------------------------------------------------------*
* usb_linux_lookup_id
Modified: head/sys/dev/usb/usb_hub.c
==============================================================================
--- head/sys/dev/usb/usb_hub.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/usb_hub.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -126,7 +126,7 @@ static devclass_t uhub_devclass;
static driver_t uhub_driver =
{
- .name = "ushub",
+ .name = "uhub",
.methods = (device_method_t[]){
DEVMETHOD(device_probe, uhub_probe),
DEVMETHOD(device_attach, uhub_attach),
@@ -144,8 +144,8 @@ static driver_t uhub_driver =
.size = sizeof(struct uhub_softc)
};
-DRIVER_MODULE(ushub, usbus, uhub_driver, uhub_devclass, 0, 0);
-DRIVER_MODULE(ushub, ushub, uhub_driver, uhub_devclass, NULL, 0);
+DRIVER_MODULE(uhub, usbus, uhub_driver, uhub_devclass, 0, 0);
+DRIVER_MODULE(uhub, uhub, uhub_driver, uhub_devclass, NULL, 0);
static void
uhub_intr_callback(struct usb2_xfer *xfer)
Modified: head/sys/dev/usb/wlan/if_rum.c
==============================================================================
--- head/sys/dev/usb/wlan/if_rum.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/wlan/if_rum.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -2538,4 +2538,4 @@ static driver_t rum_driver = {
static devclass_t rum_devclass;
-DRIVER_MODULE(rum, ushub, rum_driver, rum_devclass, NULL, 0);
+DRIVER_MODULE(rum, uhub, rum_driver, rum_devclass, NULL, 0);
Modified: head/sys/dev/usb/wlan/if_ural.c
==============================================================================
--- head/sys/dev/usb/wlan/if_ural.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/wlan/if_ural.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -375,7 +375,7 @@ static driver_t ural_driver = {
static devclass_t ural_devclass;
-DRIVER_MODULE(ural, ushub, ural_driver, ural_devclass, NULL, 0);
+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_DEPEND(ural, wlan_amrr, 1, 1, 1);
Modified: head/sys/dev/usb/wlan/if_zyd.c
==============================================================================
--- head/sys/dev/usb/wlan/if_zyd.c Mon Mar 2 05:07:05 2009 (r189274)
+++ head/sys/dev/usb/wlan/if_zyd.c Mon Mar 2 05:37:05 2009 (r189275)
@@ -3172,7 +3172,7 @@ static driver_t zyd_driver = {
static devclass_t zyd_devclass;
-DRIVER_MODULE(zyd, ushub, zyd_driver, zyd_devclass, NULL, 0);
+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_DEPEND(zyd, wlan_amrr, 1, 1, 1);
More information about the svn-src-head
mailing list