Tweak these for what I hope is the last time: change the DRIVER_MODULE()
declaration for the interface driver from "foo" to "if_foo" but leave the declaration for the miibus attached to the interface driver alone. This lets the internal module name be "if_foo" while still allowing the miibus instances to attach to "foo." This should allow ifconfig to autoload driver modules again without breaking the miibus attach.
This commit is contained in:
parent
8b22cebb2c
commit
9e4c647c74
@ -701,7 +701,7 @@ static driver_t fxp_driver = {
|
||||
|
||||
static devclass_t fxp_devclass;
|
||||
|
||||
DRIVER_MODULE(fxp, pci, fxp_driver, fxp_devclass, 0, 0);
|
||||
DRIVER_MODULE(if_fxp, pci, fxp_driver, fxp_devclass, 0, 0);
|
||||
|
||||
#endif /* __NetBSD__ */
|
||||
|
||||
|
@ -208,7 +208,7 @@ static driver_t sf_driver = {
|
||||
|
||||
static devclass_t sf_devclass;
|
||||
|
||||
DRIVER_MODULE(sf, pci, sf_driver, sf_devclass, 0, 0);
|
||||
DRIVER_MODULE(if_sf, pci, sf_driver, sf_devclass, 0, 0);
|
||||
DRIVER_MODULE(miibus, sf, miibus_driver, miibus_devclass, 0, 0);
|
||||
|
||||
#define SF_SETBIT(sc, reg, x) \
|
||||
|
@ -181,7 +181,7 @@ static driver_t sk_driver = {
|
||||
|
||||
static devclass_t sk_devclass;
|
||||
|
||||
DRIVER_MODULE(skc, pci, sk_driver, sk_devclass, 0, 0);
|
||||
DRIVER_MODULE(if_sk, pci, sk_driver, sk_devclass, 0, 0);
|
||||
|
||||
#define SK_SETBIT(sc, reg, x) \
|
||||
CSR_WRITE_4(sc, reg, CSR_READ_4(sc, reg) | x)
|
||||
|
@ -224,7 +224,7 @@ static driver_t ti_driver = {
|
||||
|
||||
static devclass_t ti_devclass;
|
||||
|
||||
DRIVER_MODULE(ti, pci, ti_driver, ti_devclass, 0, 0);
|
||||
DRIVER_MODULE(if_ti, pci, ti_driver, ti_devclass, 0, 0);
|
||||
|
||||
/*
|
||||
* Send an instruction or address to the EEPROM, check for ACK.
|
||||
|
@ -202,7 +202,7 @@ static driver_t vr_driver = {
|
||||
|
||||
static devclass_t vr_devclass;
|
||||
|
||||
DRIVER_MODULE(vr, pci, vr_driver, vr_devclass, 0, 0);
|
||||
DRIVER_MODULE(if_vr, pci, vr_driver, vr_devclass, 0, 0);
|
||||
DRIVER_MODULE(miibus, vr, miibus_driver, miibus_devclass, 0, 0);
|
||||
|
||||
#define VR_SETBIT(sc, reg, x) \
|
||||
|
@ -201,7 +201,7 @@ static driver_t al_driver = {
|
||||
|
||||
static devclass_t al_devclass;
|
||||
|
||||
DRIVER_MODULE(al, pci, al_driver, al_devclass, 0, 0);
|
||||
DRIVER_MODULE(if_al, pci, al_driver, al_devclass, 0, 0);
|
||||
DRIVER_MODULE(miibus, al, miibus_driver, miibus_devclass, 0, 0);
|
||||
|
||||
#define AL_SETBIT(sc, reg, x) \
|
||||
|
@ -197,7 +197,7 @@ static driver_t ax_driver = {
|
||||
|
||||
static devclass_t ax_devclass;
|
||||
|
||||
DRIVER_MODULE(ax, pci, ax_driver, ax_devclass, 0, 0);
|
||||
DRIVER_MODULE(if_ax, pci, ax_driver, ax_devclass, 0, 0);
|
||||
|
||||
#define AX_SETBIT(sc, reg, x) \
|
||||
CSR_WRITE_4(sc, reg, \
|
||||
|
@ -190,7 +190,7 @@ static driver_t dm_driver = {
|
||||
|
||||
static devclass_t dm_devclass;
|
||||
|
||||
DRIVER_MODULE(dm, pci, dm_driver, dm_devclass, 0, 0);
|
||||
DRIVER_MODULE(if_dm, pci, dm_driver, dm_devclass, 0, 0);
|
||||
DRIVER_MODULE(miibus, dm, miibus_driver, miibus_devclass, 0, 0);
|
||||
|
||||
#define DM_SETBIT(sc, reg, x) \
|
||||
|
@ -701,7 +701,7 @@ static driver_t fxp_driver = {
|
||||
|
||||
static devclass_t fxp_devclass;
|
||||
|
||||
DRIVER_MODULE(fxp, pci, fxp_driver, fxp_devclass, 0, 0);
|
||||
DRIVER_MODULE(if_fxp, pci, fxp_driver, fxp_devclass, 0, 0);
|
||||
|
||||
#endif /* __NetBSD__ */
|
||||
|
||||
|
@ -215,7 +215,7 @@ static driver_t mx_driver = {
|
||||
|
||||
static devclass_t mx_devclass;
|
||||
|
||||
DRIVER_MODULE(mx, pci, mx_driver, mx_devclass, 0, 0);
|
||||
DRIVER_MODULE(if_mx, pci, mx_driver, mx_devclass, 0, 0);
|
||||
|
||||
#define MX_SETBIT(sc, reg, x) \
|
||||
CSR_WRITE_4(sc, reg, \
|
||||
|
@ -207,7 +207,7 @@ static driver_t pn_driver = {
|
||||
|
||||
static devclass_t pn_devclass;
|
||||
|
||||
DRIVER_MODULE(pn, pci, pn_driver, pn_devclass, 0, 0);
|
||||
DRIVER_MODULE(if_pn, pci, pn_driver, pn_devclass, 0, 0);
|
||||
|
||||
#define PN_SETBIT(sc, reg, x) \
|
||||
CSR_WRITE_4(sc, reg, \
|
||||
|
@ -228,7 +228,7 @@ static driver_t rl_driver = {
|
||||
|
||||
static devclass_t rl_devclass;
|
||||
|
||||
DRIVER_MODULE(rl, pci, rl_driver, rl_devclass, 0, 0);
|
||||
DRIVER_MODULE(if_rl, pci, rl_driver, rl_devclass, 0, 0);
|
||||
DRIVER_MODULE(miibus, rl, miibus_driver, miibus_devclass, 0, 0);
|
||||
|
||||
#define EE_SET(x) \
|
||||
|
@ -208,7 +208,7 @@ static driver_t sf_driver = {
|
||||
|
||||
static devclass_t sf_devclass;
|
||||
|
||||
DRIVER_MODULE(sf, pci, sf_driver, sf_devclass, 0, 0);
|
||||
DRIVER_MODULE(if_sf, pci, sf_driver, sf_devclass, 0, 0);
|
||||
DRIVER_MODULE(miibus, sf, miibus_driver, miibus_devclass, 0, 0);
|
||||
|
||||
#define SF_SETBIT(sc, reg, x) \
|
||||
|
@ -185,7 +185,7 @@ static driver_t sis_driver = {
|
||||
|
||||
static devclass_t sis_devclass;
|
||||
|
||||
DRIVER_MODULE(sis, pci, sis_driver, sis_devclass, 0, 0);
|
||||
DRIVER_MODULE(if_sis, pci, sis_driver, sis_devclass, 0, 0);
|
||||
DRIVER_MODULE(miibus, sis, miibus_driver, miibus_devclass, 0, 0);
|
||||
|
||||
#define SIS_SETBIT(sc, reg, x) \
|
||||
|
@ -181,7 +181,7 @@ static driver_t sk_driver = {
|
||||
|
||||
static devclass_t sk_devclass;
|
||||
|
||||
DRIVER_MODULE(skc, pci, sk_driver, sk_devclass, 0, 0);
|
||||
DRIVER_MODULE(if_sk, pci, sk_driver, sk_devclass, 0, 0);
|
||||
|
||||
#define SK_SETBIT(sc, reg, x) \
|
||||
CSR_WRITE_4(sc, reg, CSR_READ_4(sc, reg) | x)
|
||||
|
@ -172,7 +172,7 @@ static driver_t ste_driver = {
|
||||
|
||||
static devclass_t ste_devclass;
|
||||
|
||||
DRIVER_MODULE(ste, pci, ste_driver, ste_devclass, 0, 0);
|
||||
DRIVER_MODULE(if_ste, pci, ste_driver, ste_devclass, 0, 0);
|
||||
DRIVER_MODULE(miibus, ste, miibus_driver, miibus_devclass, 0, 0);
|
||||
|
||||
#define STE_SETBIT4(sc, reg, x) \
|
||||
|
@ -224,7 +224,7 @@ static driver_t ti_driver = {
|
||||
|
||||
static devclass_t ti_devclass;
|
||||
|
||||
DRIVER_MODULE(ti, pci, ti_driver, ti_devclass, 0, 0);
|
||||
DRIVER_MODULE(if_ti, pci, ti_driver, ti_devclass, 0, 0);
|
||||
|
||||
/*
|
||||
* Send an instruction or address to the EEPROM, check for ACK.
|
||||
|
@ -361,7 +361,7 @@ static driver_t tl_driver = {
|
||||
|
||||
static devclass_t tl_devclass;
|
||||
|
||||
DRIVER_MODULE(tl, pci, tl_driver, tl_devclass, 0, 0);
|
||||
DRIVER_MODULE(if_tl, pci, tl_driver, tl_devclass, 0, 0);
|
||||
DRIVER_MODULE(miibus, tl, miibus_driver, miibus_devclass, 0, 0);
|
||||
|
||||
static u_int8_t tl_dio_read8(sc, reg)
|
||||
|
@ -202,7 +202,7 @@ static driver_t vr_driver = {
|
||||
|
||||
static devclass_t vr_devclass;
|
||||
|
||||
DRIVER_MODULE(vr, pci, vr_driver, vr_devclass, 0, 0);
|
||||
DRIVER_MODULE(if_vr, pci, vr_driver, vr_devclass, 0, 0);
|
||||
DRIVER_MODULE(miibus, vr, miibus_driver, miibus_devclass, 0, 0);
|
||||
|
||||
#define VR_SETBIT(sc, reg, x) \
|
||||
|
@ -229,7 +229,7 @@ static driver_t wb_driver = {
|
||||
|
||||
static devclass_t wb_devclass;
|
||||
|
||||
DRIVER_MODULE(wb, pci, wb_driver, wb_devclass, 0, 0);
|
||||
DRIVER_MODULE(if_wb, pci, wb_driver, wb_devclass, 0, 0);
|
||||
DRIVER_MODULE(miibus, wb, miibus_driver, miibus_devclass, 0, 0);
|
||||
|
||||
#define WB_SETBIT(sc, reg, x) \
|
||||
|
@ -285,7 +285,7 @@ static driver_t xl_driver = {
|
||||
|
||||
static devclass_t xl_devclass;
|
||||
|
||||
DRIVER_MODULE(xl, pci, xl_driver, xl_devclass, 0, 0);
|
||||
DRIVER_MODULE(if_xl, pci, xl_driver, xl_devclass, 0, 0);
|
||||
DRIVER_MODULE(miibus, xl, miibus_driver, miibus_devclass, 0, 0);
|
||||
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user