- Express hard dependencies on bus (pci, isa, pccard) and

network layer (ether).
- Don't abuse module names to facilitate ifconfig module loading;
  such abuse isn't really needed.  (And if we do need type information
  associated with a module then we should make it explicit and not
  use hacks.)
This commit is contained in:
Matthew N. Dodd 2003-04-15 06:37:30 +00:00
parent 10646d5f83
commit f246e4a17f
86 changed files with 223 additions and 92 deletions

View File

@ -264,3 +264,5 @@ static driver_t agp_ali_driver = {
static devclass_t agp_devclass;
DRIVER_MODULE(agp_ali, pci, agp_ali_driver, agp_devclass, 0, 0);
MODULE_DEPEND(agp_ali, agp, 1, 1, 1);
MODULE_DEPEND(agp_ali, pci, 1, 1, 1);

View File

@ -417,3 +417,5 @@ static driver_t agp_amd_driver = {
static devclass_t agp_devclass;
DRIVER_MODULE(agp_amd, pci, agp_amd_driver, agp_devclass, 0, 0);
MODULE_DEPEND(agp_amd, agp, 1, 1, 1);
MODULE_DEPEND(agp_amd, pci, 1, 1, 1);

View File

@ -701,3 +701,5 @@ static driver_t agp_i810_driver = {
static devclass_t agp_devclass;
DRIVER_MODULE(agp_i810, pci, agp_i810_driver, agp_devclass, 0, 0);
MODULE_DEPEND(agp_i810, agp, 1, 1, 1);
MODULE_DEPEND(agp_i810, pci, 1, 1, 1);

View File

@ -378,3 +378,5 @@ static driver_t agp_intel_driver = {
static devclass_t agp_devclass;
DRIVER_MODULE(agp_intel, pci, agp_intel_driver, agp_devclass, 0, 0);
MODULE_DEPEND(agp_intel, agp, 1, 1, 1);
MODULE_DEPEND(agp_intel, pci, 1, 1, 1);

View File

@ -258,3 +258,5 @@ static driver_t agp_sis_driver = {
static devclass_t agp_devclass;
DRIVER_MODULE(agp_sis, pci, agp_sis_driver, agp_devclass, 0, 0);
MODULE_DEPEND(agp_sis, agp, 1, 1, 1);
MODULE_DEPEND(agp_sis, pci, 1, 1, 1);

View File

@ -255,3 +255,5 @@ static driver_t agp_via_driver = {
static devclass_t agp_devclass;
DRIVER_MODULE(agp_via, pci, agp_via_driver, agp_devclass, 0, 0);
MODULE_DEPEND(agp_via, agp, 1, 1, 1);
MODULE_DEPEND(agp_via, pci, 1, 1, 1);

View File

@ -166,5 +166,6 @@ static driver_t an_isa_driver = {
static devclass_t an_isa_devclass;
DRIVER_MODULE(if_an, isa, an_isa_driver, an_isa_devclass, 0, 0);
MODULE_DEPEND(if_an, wlan, 1, 1, 1);
DRIVER_MODULE(an, isa, an_isa_driver, an_isa_devclass, 0, 0);
MODULE_DEPEND(an, isa, 1, 1, 1);
MODULE_DEPEND(an, wlan, 1, 1, 1);

View File

@ -105,8 +105,9 @@ static driver_t an_pccard_driver = {
static devclass_t an_pccard_devclass;
DRIVER_MODULE(if_an, pccard, an_pccard_driver, an_pccard_devclass, 0, 0);
MODULE_DEPEND(if_an, wlan, 1, 1, 1);
DRIVER_MODULE(an, pccard, an_pccard_driver, an_pccard_devclass, 0, 0);
MODULE_DEPEND(an, wlan, 1, 1, 1);
MODULE_DEPEND(an, pccard, 1, 1, 1);
static const struct pccard_product an_pccard_products[] = {
PCMCIA_CARD(AIRONET, PC4800, 0),

View File

@ -297,5 +297,6 @@ static driver_t an_pci_driver = {
static devclass_t an_devclass;
DRIVER_MODULE(if_an, pci, an_pci_driver, an_devclass, 0, 0);
MODULE_DEPEND(if_an, wlan, 1, 1, 1);
DRIVER_MODULE(an, pci, an_pci_driver, an_devclass, 0, 0);
MODULE_DEPEND(an, pci, 1, 1, 1);
MODULE_DEPEND(an, wlan, 1, 1, 1);

View File

@ -90,7 +90,8 @@ static driver_t ar_isa_driver = {
sizeof (struct ar_hardc)
};
DRIVER_MODULE(if_ar, isa, ar_isa_driver, ar_devclass, 0, 0);
DRIVER_MODULE(ar, isa, ar_isa_driver, ar_devclass, 0, 0);
MODULE_DEPEND(ar, isa, 1, 1, 1);
/*
* Probe to see if it is there.

View File

@ -71,7 +71,8 @@ static driver_t ar_pci_driver = {
sizeof(struct ar_hardc),
};
DRIVER_MODULE(if_ar, pci, ar_pci_driver, ar_devclass, 0, 0);
DRIVER_MODULE(ar, pci, ar_pci_driver, ar_devclass, 0, 0);
MODULE_DEPEND(ar, pci, 1, 1, 1);
static int
ar_pci_probe(device_t device)

View File

@ -111,6 +111,8 @@ __FBSDID("$FreeBSD$");
#define BGE_CSUM_FEATURES (CSUM_IP | CSUM_TCP | CSUM_UDP)
MODULE_DEPEND(bge, pci, 1, 1, 1);
MODULE_DEPEND(bge, ether, 1, 1, 1);
MODULE_DEPEND(bge, miibus, 1, 1, 1);
/* "controller miibus0" required. See GENERIC if you get errors here. */
@ -241,7 +243,7 @@ static driver_t bge_driver = {
static devclass_t bge_devclass;
DRIVER_MODULE(if_bge, pci, bge_driver, bge_devclass, 0, 0);
DRIVER_MODULE(bge, pci, bge_driver, bge_devclass, 0, 0);
DRIVER_MODULE(miibus, bge, miibus_driver, miibus_devclass, 0, 0);
static u_int32_t

View File

@ -132,4 +132,5 @@ static driver_t cm_isa_driver = {
sizeof(struct cm_softc)
};
DRIVER_MODULE(if_cm, isa, cm_isa_driver, cm_devclass, 0, 0);
DRIVER_MODULE(cm, isa, cm_isa_driver, cm_devclass, 0, 0);
MODULE_DEPEND(cm, isa, 1, 1, 1);

View File

@ -337,7 +337,8 @@ static driver_t cnw_pccard_driver = {
static devclass_t cnw_pccard_devclass;
DRIVER_MODULE(if_cnw, pccard, cnw_pccard_driver, cnw_pccard_devclass, 0, 0);
DRIVER_MODULE(cnw, pccard, cnw_pccard_driver, cnw_pccard_devclass, 0, 0);
MODULE_DEPEND(cnw, ether, 1, 1, 1);
#endif /* !defined(__FreeBSD__) */

View File

@ -126,4 +126,6 @@ static driver_t cs_isa_driver = {
extern devclass_t cs_devclass;
DRIVER_MODULE(if_cs, isa, cs_isa_driver, cs_devclass, 0, 0);
DRIVER_MODULE(cs, isa, cs_isa_driver, cs_devclass, 0, 0);
MODULE_DEPEND(cs, isa, 1, 1, 1);
MODULE_DEPEND(cs, ether, 1, 1, 1);

View File

@ -123,5 +123,6 @@ static driver_t cs_pccard_driver = {
extern devclass_t cs_devclass;
DRIVER_MODULE(if_cs, pccard, cs_pccard_driver, cs_devclass, 0, 0);
MODULE_DEPEND(if_cs, pccard, 1, 1, 1);
DRIVER_MODULE(cs, pccard, cs_pccard_driver, cs_devclass, 0, 0);
MODULE_DEPEND(cs, pccard, 1, 1, 1);
MODULE_DEPEND(cs, ether, 1, 1, 1);

View File

@ -88,6 +88,7 @@ static driver_t cy_pci_driver = {
static devclass_t cy_devclass;
DRIVER_MODULE(cy, pci, cy_pci_driver, cy_devclass, 0, 0);
MODULE_DEPEND(cy, pci, 1, 1, 1);
static int
cy_pci_probe(dev)

View File

@ -131,6 +131,8 @@ __FBSDID("$FreeBSD$");
#include <pci/if_dcreg.h>
MODULE_DEPEND(dc, pci, 1, 1, 1);
MODULE_DEPEND(dc, ether, 1, 1, 1);
MODULE_DEPEND(dc, miibus, 1, 1, 1);
/* "controller miibus0" required. See GENERIC if you get errors here. */
@ -306,8 +308,8 @@ SYSCTL_INT(_hw, OID_AUTO, dc_quick, CTLFLAG_RW,
&dc_quick,0,"do not mdevget in dc driver");
#endif
DRIVER_MODULE(if_dc, cardbus, dc_driver, dc_devclass, 0, 0);
DRIVER_MODULE(if_dc, pci, dc_driver, dc_devclass, 0, 0);
DRIVER_MODULE(dc, cardbus, dc_driver, dc_devclass, 0, 0);
DRIVER_MODULE(dc, pci, dc_driver, dc_devclass, 0, 0);
DRIVER_MODULE(miibus, dc, miibus_driver, miibus_devclass, 0, 0);
#define DC_SETBIT(sc, reg, x) \

View File

@ -5259,4 +5259,4 @@ static driver_t tulip_pci_driver = {
sizeof(tulip_softc_t),
};
static devclass_t tulip_devclass;
DRIVER_MODULE(if_de, pci, tulip_pci_driver, tulip_devclass, 0, 0);
DRIVER_MODULE(de, pci, tulip_pci_driver, tulip_devclass, 0, 0);

View File

@ -1753,4 +1753,6 @@ static driver_t ed_isa_driver = {
sizeof(struct ed_softc)
};
DRIVER_MODULE(if_ed, isa, ed_isa_driver, ed_devclass, 0, 0);
DRIVER_MODULE(ed, isa, ed_isa_driver, ed_devclass, 0, 0);
MODULE_DEPEND(ed, isa, 1, 1, 1);
MODULE_DEPEND(ed, ether, 1, 1, 1);

View File

@ -152,4 +152,6 @@ static driver_t ed_isa_driver = {
sizeof(struct ed_softc)
};
DRIVER_MODULE(if_ed, isa, ed_isa_driver, ed_devclass, 0, 0);
DRIVER_MODULE(ed, isa, ed_isa_driver, ed_devclass, 0, 0);
MODULE_DEPEND(ed, isa, 1, 1, 1);
MODULE_DEPEND(ed, ether, 1, 1, 1);

View File

@ -64,6 +64,8 @@
MODULE_DEPEND(ed, miibus, 1, 1, 1);
#endif
MODULE_DEPEND(ed, ether, 1, 1, 1);
MODULE_DEPEND(ed, pccard, 1, 1, 1);
/*
* PC-Card (PCMCIA) specific code.
@ -525,7 +527,7 @@ static driver_t ed_pccard_driver = {
sizeof(struct ed_softc)
};
DRIVER_MODULE(if_ed, pccard, ed_pccard_driver, ed_devclass, 0, 0);
DRIVER_MODULE(ed, pccard, ed_pccard_driver, ed_devclass, 0, 0);
#ifndef ED_NO_MIIBUS
DRIVER_MODULE(miibus, ed, miibus_driver, miibus_devclass, 0, 0);
#endif

View File

@ -120,4 +120,6 @@ static driver_t ed_pci_driver = {
sizeof(struct ed_softc),
};
DRIVER_MODULE(if_ed, pci, ed_pci_driver, ed_devclass, 0, 0);
DRIVER_MODULE(ed, pci, ed_pci_driver, ed_devclass, 0, 0);
MODULE_DEPEND(ed, pci, 1, 1, 1);
MODULE_DEPEND(ed, ether, 1, 1, 1);

View File

@ -174,7 +174,9 @@ static driver_t em_driver = {
};
static devclass_t em_devclass;
DRIVER_MODULE(if_em, pci, em_driver, em_devclass, 0, 0);
DRIVER_MODULE(em, pci, em_driver, em_devclass, 0, 0);
MODULE_DEPEND(em, pci, 1, 1, 1);
MODULE_DEPEND(em, ether, 1, 1, 1);
/*********************************************************************
* Device identification routine

View File

@ -481,5 +481,5 @@ static driver_t en_driver = {
static devclass_t en_devclass;
DRIVER_MODULE(if_en, pci, en_driver, en_devclass, 0, 0);
DRIVER_MODULE(en, pci, en_driver, en_devclass, 0, 0);

View File

@ -684,6 +684,6 @@ static driver_t fwe_driver = {
};
DRIVER_MODULE(if_fwe, firewire, fwe_driver, fwe_devclass, 0, 0);
MODULE_VERSION(if_fwe, 1);
MODULE_DEPEND(if_fwe, firewire, 1, 1, 1);
DRIVER_MODULE(fwe, firewire, fwe_driver, fwe_devclass, 0, 0);
MODULE_VERSION(fwe, 1);
MODULE_DEPEND(fwe, firewire, 1, 1, 1);

View File

@ -79,6 +79,8 @@ __FBSDID("$FreeBSD$");
#include <dev/fxp/if_fxpvar.h>
#include <dev/fxp/rcvbundl.h>
MODULE_DEPEND(fxp, pci, 1, 1, 1);
MODULE_DEPEND(fxp, ether, 1, 1, 1);
MODULE_DEPEND(fxp, miibus, 1, 1, 1);
#include "miibus_if.h"
@ -251,8 +253,8 @@ static driver_t fxp_driver = {
static devclass_t fxp_devclass;
DRIVER_MODULE(if_fxp, pci, fxp_driver, fxp_devclass, 0, 0);
DRIVER_MODULE(if_fxp, cardbus, fxp_driver, fxp_devclass, 0, 0);
DRIVER_MODULE(fxp, pci, fxp_driver, fxp_devclass, 0, 0);
DRIVER_MODULE(fxp, cardbus, fxp_driver, fxp_devclass, 0, 0);
DRIVER_MODULE(miibus, fxp, miibus_driver, miibus_devclass, 0, 0);
static int fxp_rnr;

View File

@ -110,7 +110,9 @@ static driver_t gem_pci_driver = {
};
DRIVER_MODULE(if_gem, pci, gem_pci_driver, gem_devclass, 0, 0);
DRIVER_MODULE(gem, pci, gem_pci_driver, gem_devclass, 0, 0);
MODULE_DEPEND(gem, pci, 1, 1, 1);
MODULE_DEPEND(gem, ether, 1, 1, 1);
struct gem_pci_dev {
u_int32_t gpd_devid;

View File

@ -72,6 +72,8 @@
#include <dev/gx/if_gxreg.h>
#include <dev/gx/if_gxvar.h>
MODULE_DEPEND(gx, pci, 1, 1, 1);
MODULE_DEPEND(gx, ether, 1, 1, 1);
MODULE_DEPEND(gx, miibus, 1, 1, 1);
#include "miibus_if.h"
@ -196,7 +198,7 @@ static driver_t gx_driver = {
static devclass_t gx_devclass;
DRIVER_MODULE(if_gx, pci, gx_driver, gx_devclass, 0, 0);
DRIVER_MODULE(gx, pci, gx_driver, gx_devclass, 0, 0);
DRIVER_MODULE(miibus, gx, miibus_driver, miibus_devclass, 0, 0);
static struct gx_device *

View File

@ -109,7 +109,9 @@ static driver_t hme_pci_driver = {
sizeof(struct hme_pci_softc)
};
DRIVER_MODULE(if_hme, pci, hme_pci_driver, hme_devclass, 0, 0);
DRIVER_MODULE(hme, pci, hme_pci_driver, hme_devclass, 0, 0);
MODULE_DEPEND(hme, pci, 1, 1, 1);
MODULE_DEPEND(hme, ether, 1, 1, 1);
int
hme_pci_probe(device_t dev)

View File

@ -124,7 +124,8 @@ static driver_t hme_sbus_driver = {
sizeof(struct hme_sbus_softc)
};
DRIVER_MODULE(if_hme, sbus, hme_sbus_driver, hme_devclass, 0, 0);
DRIVER_MODULE(hme, sbus, hme_sbus_driver, hme_devclass, 0, 0);
MODULE_DEPEND(hme, ether, 1, 1, 1);
static int
hme_sbus_probe(device_t dev)

View File

@ -189,8 +189,11 @@ static driver_t lge_driver = {
static devclass_t lge_devclass;
DRIVER_MODULE(if_lge, pci, lge_driver, lge_devclass, 0, 0);
DRIVER_MODULE(lge, pci, lge_driver, lge_devclass, 0, 0);
DRIVER_MODULE(miibus, lge, miibus_driver, miibus_devclass, 0, 0);
MODULE_DEPEND(lge, pci, 1, 1, 1);
MODULE_DEPEND(lge, ether, 1, 1, 1);
MODULE_DEPEND(lge, miibus, 1, 1, 1);
#define LGE_SETBIT(sc, reg, x) \
CSR_WRITE_4(sc, reg, \

View File

@ -312,4 +312,6 @@ static driver_t lnc_isa_driver = {
sizeof(struct lnc_softc),
};
DRIVER_MODULE(if_lnc, isa, lnc_isa_driver, lnc_devclass, 0, 0);
DRIVER_MODULE(lnc, isa, lnc_isa_driver, lnc_devclass, 0, 0);
MODULE_DEPEND(lnc, isa, 1, 1, 1);
MODULE_DEPEND(lnc, ether, 1, 1, 1);

View File

@ -283,4 +283,6 @@ static driver_t lnc_isa_driver = {
sizeof(struct lnc_softc),
};
DRIVER_MODULE(if_lnc, isa, lnc_isa_driver, lnc_devclass, 0, 0);
DRIVER_MODULE(lnc, isa, lnc_isa_driver, lnc_devclass, 0, 0);
MODULE_DEPEND(lnc, isa, 1, 1, 1);
MODULE_DEPEND(lnc, ether, 1, 1, 1);

View File

@ -220,4 +220,6 @@ static driver_t lnc_pci_driver = {
sizeof(struct lnc_softc),
};
DRIVER_MODULE(if_lnc, pci, lnc_pci_driver, lnc_devclass, 0, 0);
DRIVER_MODULE(lnc, pci, lnc_pci_driver, lnc_devclass, 0, 0);
MODULE_DEPEND(lnc, pci, 1, 1, 1);
MODULE_DEPEND(lnc, ether, 1, 1, 1);

View File

@ -171,7 +171,9 @@ static driver_t my_driver = {
static devclass_t my_devclass;
DRIVER_MODULE(if_my, pci, my_driver, my_devclass, 0, 0);
DRIVER_MODULE(my, pci, my_driver, my_devclass, 0, 0);
MODULE_DEPEND(my, pci, 1, 1, 1);
MODULE_DEPEND(my, ether, 1, 1, 1);
static long
my_send_cmd_to_phy(struct my_softc * sc, int opcode, int regad)

View File

@ -126,6 +126,8 @@ __FBSDID("$FreeBSD$");
#include <dev/nge/if_ngereg.h>
MODULE_DEPEND(nge, pci, 1, 1, 1);
MODULE_DEPEND(nge, ether, 1, 1, 1);
MODULE_DEPEND(nge, miibus, 1, 1, 1);
/* "controller miibus0" required. See GENERIC if you get errors here. */
@ -222,7 +224,7 @@ static driver_t nge_driver = {
static devclass_t nge_devclass;
DRIVER_MODULE(if_nge, pci, nge_driver, nge_devclass, 0, 0);
DRIVER_MODULE(nge, pci, nge_driver, nge_devclass, 0, 0);
DRIVER_MODULE(miibus, nge, miibus_driver, miibus_devclass, 0, 0);
#define NGE_SETBIT(sc, reg, x) \

View File

@ -293,6 +293,6 @@ static driver_t pdq_eisa_driver = {
sizeof(pdq_softc_t),
};
DRIVER_MODULE(if_fea, eisa, pdq_eisa_driver, pdq_devclass, 0, 0);
/* MODULE_DEPEND(if_fea, eisa, 1, 1, 1); */
MODULE_DEPEND(if_fea, fddi, 1, 1, 1);
DRIVER_MODULE(fea, eisa, pdq_eisa_driver, pdq_devclass, 0, 0);
/* MODULE_DEPEND(fea, eisa, 1, 1, 1); */
MODULE_DEPEND(fea, fddi, 1, 1, 1);

View File

@ -231,6 +231,6 @@ static driver_t pdq_pci_driver = {
sizeof(pdq_softc_t),
};
DRIVER_MODULE(if_fpa, pci, pdq_pci_driver, pdq_devclass, 0, 0);
/* MODULE_DEPEND(if_fpa, pci, 1, 1, 1); */
MODULE_DEPEND(if_fpa, fddi, 1, 1, 1);
DRIVER_MODULE(fpa, pci, pdq_pci_driver, pdq_devclass, 0, 0);
MODULE_DEPEND(fpa, pci, 1, 1, 1);
MODULE_DEPEND(fpa, fddi, 1, 1, 1);

View File

@ -69,8 +69,8 @@ static struct isa_pnp_id sbni_ids[] = {
{ 0, NULL } /* we have no pnp sbni cards atm. */
};
DRIVER_MODULE(if_sbni, isa, sbni_isa_driver, sbni_isa_devclass, 0, 0);
DRIVER_MODULE(sbni, isa, sbni_isa_driver, sbni_isa_devclass, 0, 0);
MODULE_DEPEND(sbni, isa, 1, 1, 1);
static int
sbni_probe_isa(device_t dev)

View File

@ -67,8 +67,8 @@ static driver_t sbni_pci_driver = {
static devclass_t sbni_pci_devclass;
DRIVER_MODULE(if_sbni, pci, sbni_pci_driver, sbni_pci_devclass, 0, 0);
DRIVER_MODULE(sbni, pci, sbni_pci_driver, sbni_pci_devclass, 0, 0);
MODULE_DEPEND(sbni, pci, 1, 1, 1);
static int
sbni_pci_probe(device_t dev)

View File

@ -200,7 +200,8 @@ static driver_t sbsh_driver = {
static devclass_t sbsh_devclass;
DRIVER_MODULE(if_sbsh, pci, sbsh_driver, sbsh_devclass, 0, 0);
DRIVER_MODULE(sbsh, pci, sbsh_driver, sbsh_devclass, 0, 0);
MODULE_DEPEND(sbsh, pci, 1, 1, 1);
static int
sbsh_probe(device_t dev)

View File

@ -118,6 +118,8 @@ __FBSDID("$FreeBSD$");
#include <pci/if_sfreg.h>
MODULE_DEPEND(sf, pci, 1, 1, 1);
MODULE_DEPEND(sf, ether, 1, 1, 1);
MODULE_DEPEND(sf, miibus, 1, 1, 1);
static struct sf_type sf_devs[] = {
@ -203,7 +205,7 @@ static driver_t sf_driver = {
static devclass_t sf_devclass;
DRIVER_MODULE(if_sf, pci, sf_driver, sf_devclass, 0, 0);
DRIVER_MODULE(sf, pci, sf_driver, sf_devclass, 0, 0);
DRIVER_MODULE(miibus, sf, miibus_driver, miibus_devclass, 0, 0);
#define SF_SETBIT(sc, reg, x) \

View File

@ -107,6 +107,8 @@ __FBSDID("$FreeBSD$");
#include <pci/if_skreg.h>
#include <pci/xmaciireg.h>
MODULE_DEPEND(sk, pci, 1, 1, 1);
MODULE_DEPEND(sk, ether, 1, 1, 1);
MODULE_DEPEND(sk, miibus, 1, 1, 1);
/* "controller miibus0" required. See GENERIC if you get errors here. */
@ -236,7 +238,7 @@ static driver_t sk_driver = {
static devclass_t sk_devclass;
DRIVER_MODULE(if_sk, pci, skc_driver, skc_devclass, 0, 0);
DRIVER_MODULE(sk, pci, skc_driver, skc_devclass, 0, 0);
DRIVER_MODULE(sk, skc, sk_driver, sk_devclass, 0, 0);
DRIVER_MODULE(miibus, sk, miibus_driver, miibus_devclass, 0, 0);

View File

@ -87,4 +87,6 @@ static driver_t sn_isa_driver = {
extern devclass_t sn_devclass;
DRIVER_MODULE(if_sn, isa, sn_isa_driver, sn_devclass, 0, 0);
DRIVER_MODULE(sn, isa, sn_isa_driver, sn_devclass, 0, 0);
MODULE_DEPEND(sn, isa, 1, 1, 1);
MODULE_DEPEND(sn, ether, 1, 1, 1);

View File

@ -126,5 +126,6 @@ static driver_t sn_pccard_driver = {
extern devclass_t sn_devclass;
DRIVER_MODULE(if_sn, pccard, sn_pccard_driver, sn_devclass, 0, 0);
MODULE_DEPEND(if_sn, pccard, 1, 1, 1);
DRIVER_MODULE(sn, pccard, sn_pccard_driver, sn_devclass, 0, 0);
MODULE_DEPEND(sn, pccard, 1, 1, 1);
MODULE_DEPEND(sn, ether, 1, 1, 1);

View File

@ -216,4 +216,6 @@ static driver_t snc_isa_driver = {
sizeof(struct snc_softc)
};
DRIVER_MODULE(if_snc, isa, snc_isa_driver, snc_devclass, 0, 0);
DRIVER_MODULE(snc, isa, snc_isa_driver, snc_devclass, 0, 0);
MODULE_DEPEND(snc, isa, 1, 1, 1);
MODULE_DEPEND(snc, ether, 1, 1, 1);

View File

@ -76,7 +76,9 @@ static driver_t snc_pccard_driver = {
sizeof(struct snc_softc)
};
DRIVER_MODULE(if_snc, pccard, snc_pccard_driver, snc_devclass, 0, 0);
DRIVER_MODULE(snc, pccard, snc_pccard_driver, snc_devclass, 0, 0);
MODULE_DEPEND(snc, ether, 1, 1, 1);
MODULE_DEPEND(snc, pccard, 1, 1, 1);
/*
* snc_pccard_detach - unload the driver and clear the table.

View File

@ -93,7 +93,8 @@ static driver_t sr_isa_driver = {
sizeof (struct sr_hardc)
};
DRIVER_MODULE(if_sr, isa, sr_isa_driver, sr_devclass, 0, 0);
DRIVER_MODULE(sr, isa, sr_isa_driver, sr_devclass, 0, 0);
MODULE_DEPEND(sr, isa, 1, 1, 1);
static u_int src_get8_io(u_int base, u_int off);
static u_int src_get16_io(u_int base, u_int off);

View File

@ -69,7 +69,8 @@ static driver_t sr_pci_driver = {
sizeof(struct sr_hardc),
};
DRIVER_MODULE(if_sr, pci, sr_pci_driver, sr_devclass, 0, 0);
DRIVER_MODULE(sr, pci, sr_pci_driver, sr_devclass, 0, 0);
MODULE_DEPEND(sr, pci, 1, 1, 1);
static u_int src_get8_mem(u_int base, u_int off);
static u_int src_get16_mem(u_int base, u_int off);

View File

@ -279,7 +279,9 @@ static driver_t ti_driver = {
static devclass_t ti_devclass;
DRIVER_MODULE(if_ti, pci, ti_driver, ti_devclass, 0, 0);
DRIVER_MODULE(ti, pci, ti_driver, ti_devclass, 0, 0);
MODULE_DEPEND(ti, pci, 1, 1, 1);
MODULE_DEPEND(ti, ether, 1, 1, 1);
/* List of Tigon softcs */
static STAILQ_HEAD(ti_softc_list, ti_softc) ti_sc_list;

View File

@ -81,6 +81,8 @@
#include <dev/tx/if_txreg.h>
#include <dev/tx/if_txvar.h>
MODULE_DEPEND(tx, pci, 1, 1, 1);
MODULE_DEPEND(tx, ether, 1, 1, 1);
MODULE_DEPEND(tx, miibus, 1, 1, 1);
static int epic_ifioctl(register struct ifnet *, u_long, caddr_t);
@ -151,7 +153,7 @@ static driver_t epic_driver = {
static devclass_t epic_devclass;
DRIVER_MODULE(if_tx, pci, epic_driver, epic_devclass, 0, 0);
DRIVER_MODULE(tx, pci, epic_driver, epic_devclass, 0, 0);
DRIVER_MODULE(miibus, tx, miibus_driver, miibus_devclass, 0, 0);
static struct epic_type epic_devs[] = {

View File

@ -182,7 +182,9 @@ static driver_t txp_driver = {
static devclass_t txp_devclass;
DRIVER_MODULE(if_txp, pci, txp_driver, txp_devclass, 0, 0);
DRIVER_MODULE(txp, pci, txp_driver, txp_devclass, 0, 0);
MODULE_DEPEND(txp, pci, 1, 1, 1);
MODULE_DEPEND(txp, ether, 1, 1, 1);
static int
txp_probe(dev)

View File

@ -92,8 +92,9 @@ __FBSDID("$FreeBSD$");
#include <dev/usb/if_auereg.h>
MODULE_DEPEND(if_aue, miibus, 1, 1, 1);
MODULE_DEPEND(if_aue, usb, 1, 1, 1);
MODULE_DEPEND(aue, usb, 1, 1, 1);
MODULE_DEPEND(aue, ether, 1, 1, 1);
MODULE_DEPEND(aue, miibus, 1, 1, 1);
/* "controller miibus0" required. See GENERIC if you get errors here. */
#include "miibus_if.h"
@ -235,7 +236,7 @@ Static driver_t aue_driver = {
Static devclass_t aue_devclass;
DRIVER_MODULE(if_aue, uhub, aue_driver, aue_devclass, usbd_driver_load, 0);
DRIVER_MODULE(aue, uhub, aue_driver, aue_devclass, usbd_driver_load, 0);
DRIVER_MODULE(miibus, aue, miibus_driver, miibus_devclass, 0, 0);
#define AUE_SETBIT(sc, reg, x) \

View File

@ -139,8 +139,9 @@ Static driver_t cue_driver = {
Static devclass_t cue_devclass;
DRIVER_MODULE(if_cue, uhub, cue_driver, cue_devclass, usbd_driver_load, 0);
MODULE_DEPEND(if_cue, usb, 1, 1, 1);
DRIVER_MODULE(cue, uhub, cue_driver, cue_devclass, usbd_driver_load, 0);
MODULE_DEPEND(cue, usb, 1, 1, 1);
MODULE_DEPEND(cue, ether, 1, 1, 1);
#define CUE_SETBIT(sc, reg, x) \
cue_csr_write_1(sc, reg, cue_csr_read_1(sc, reg) | (x))

View File

@ -93,7 +93,8 @@ __FBSDID("$FreeBSD$");
#include <dev/usb/if_kuereg.h>
#include <dev/usb/kue_fw.h>
MODULE_DEPEND(if_kue, usb, 1, 1, 1);
MODULE_DEPEND(kue, usb, 1, 1, 1);
MODULE_DEPEND(kue, ether, 1, 1, 1);
/*
* Various supported device vendors/products.
@ -167,7 +168,7 @@ Static driver_t kue_driver = {
Static devclass_t kue_devclass;
DRIVER_MODULE(if_kue, uhub, kue_driver, kue_devclass, usbd_driver_load, 0);
DRIVER_MODULE(kue, uhub, kue_driver, kue_devclass, usbd_driver_load, 0);
/*
* We have a custom do_request function which is almost like the

View File

@ -95,6 +95,8 @@ __FBSDID("$FreeBSD$");
#include <pci/if_vrreg.h>
MODULE_DEPEND(vr, pci, 1, 1, 1);
MODULE_DEPEND(vr, ether, 1, 1, 1);
MODULE_DEPEND(vr, miibus, 1, 1, 1);
/* "controller miibus0" required. See GENERIC if you get errors here. */
@ -200,7 +202,7 @@ static driver_t vr_driver = {
static devclass_t vr_devclass;
DRIVER_MODULE(if_vr, pci, vr_driver, vr_devclass, 0, 0);
DRIVER_MODULE(vr, pci, vr_driver, vr_devclass, 0, 0);
DRIVER_MODULE(miibus, vr, miibus_driver, miibus_devclass, 0, 0);
#define VR_SETBIT(sc, reg, x) \

View File

@ -69,7 +69,9 @@ static driver_t vx_driver = {
static devclass_t vx_devclass;
DRIVER_MODULE(if_vx, pci, vx_driver, vx_devclass, 0, 0);
DRIVER_MODULE(vx, pci, vx_driver, vx_devclass, 0, 0);
MODULE_DEPEND(vx, pci, 1, 1, 1);
MODULE_DEPEND(vx, ether, 1, 1, 1);
static void
vx_pci_shutdown(

View File

@ -116,8 +116,9 @@ static driver_t wi_pccard_driver = {
sizeof(struct wi_softc)
};
DRIVER_MODULE(if_wi, pccard, wi_pccard_driver, wi_devclass, 0, 0);
MODULE_DEPEND(if_wi, wlan, 1, 1, 1);
DRIVER_MODULE(wi, pccard, wi_pccard_driver, wi_devclass, 0, 0);
MODULE_DEPEND(wi, wlan, 1, 1, 1);
MODULE_DEPEND(wi, pccard, 1, 1, 1);
#if __FreeBSD_version >= 500000
static const struct pccard_product wi_pccard_products[] = {

View File

@ -107,8 +107,9 @@ static struct {
{0, 0, 0, NULL}
};
DRIVER_MODULE(if_wi, pci, wi_pci_driver, wi_devclass, 0, 0);
MODULE_DEPEND(if_wi, wlan, 1, 1, 1);
DRIVER_MODULE(wi, pci, wi_pci_driver, wi_devclass, 0, 0);
MODULE_DEPEND(wi, pci, 1, 1, 1);
MODULE_DEPEND(wi, wlan, 1, 1, 1);
static int
wi_pci_probe(dev)

View File

@ -264,3 +264,5 @@ static driver_t agp_ali_driver = {
static devclass_t agp_devclass;
DRIVER_MODULE(agp_ali, pci, agp_ali_driver, agp_devclass, 0, 0);
MODULE_DEPEND(agp_ali, agp, 1, 1, 1);
MODULE_DEPEND(agp_ali, pci, 1, 1, 1);

View File

@ -417,3 +417,5 @@ static driver_t agp_amd_driver = {
static devclass_t agp_devclass;
DRIVER_MODULE(agp_amd, pci, agp_amd_driver, agp_devclass, 0, 0);
MODULE_DEPEND(agp_amd, agp, 1, 1, 1);
MODULE_DEPEND(agp_amd, pci, 1, 1, 1);

View File

@ -701,3 +701,5 @@ static driver_t agp_i810_driver = {
static devclass_t agp_devclass;
DRIVER_MODULE(agp_i810, pci, agp_i810_driver, agp_devclass, 0, 0);
MODULE_DEPEND(agp_i810, agp, 1, 1, 1);
MODULE_DEPEND(agp_i810, pci, 1, 1, 1);

View File

@ -378,3 +378,5 @@ static driver_t agp_intel_driver = {
static devclass_t agp_devclass;
DRIVER_MODULE(agp_intel, pci, agp_intel_driver, agp_devclass, 0, 0);
MODULE_DEPEND(agp_intel, agp, 1, 1, 1);
MODULE_DEPEND(agp_intel, pci, 1, 1, 1);

View File

@ -258,3 +258,5 @@ static driver_t agp_sis_driver = {
static devclass_t agp_devclass;
DRIVER_MODULE(agp_sis, pci, agp_sis_driver, agp_devclass, 0, 0);
MODULE_DEPEND(agp_sis, agp, 1, 1, 1);
MODULE_DEPEND(agp_sis, pci, 1, 1, 1);

View File

@ -255,3 +255,5 @@ static driver_t agp_via_driver = {
static devclass_t agp_devclass;
DRIVER_MODULE(agp_via, pci, agp_via_driver, agp_devclass, 0, 0);
MODULE_DEPEND(agp_via, agp, 1, 1, 1);
MODULE_DEPEND(agp_via, pci, 1, 1, 1);

View File

@ -637,5 +637,6 @@ static driver_t alpm_driver = {
};
DRIVER_MODULE(alpm, pci, alpm_driver, alpm_devclass, 0, 0);
MODULE_DEPEND(alpm, pci, 1, 1, 1);
MODULE_DEPEND(alpm, smbus, SMBUS_MINVER, SMBUS_PREFVER, SMBUS_MAXVER);
MODULE_VERSION(alpm, 1);

View File

@ -676,6 +676,7 @@ static driver_t nfpm_driver = {
DRIVER_MODULE(amdpm, pci, amdpm_driver, amdpm_devclass, 0, 0);
DRIVER_MODULE(nfpm, pci, nfpm_driver, nfpm_devclass, 0, 0);
MODULE_DEPEND(amdpm, pci, 1, 1, 1);
MODULE_DEPEND(amdpm, smbus, SMBUS_MINVER, SMBUS_PREFVER, SMBUS_MAXVER);
MODULE_VERSION(amdpm, 1);

View File

@ -88,6 +88,7 @@ static driver_t cy_pci_driver = {
static devclass_t cy_devclass;
DRIVER_MODULE(cy, pci, cy_pci_driver, cy_devclass, 0, 0);
MODULE_DEPEND(cy, pci, 1, 1, 1);
static int
cy_pci_probe(dev)

View File

@ -131,6 +131,8 @@ __FBSDID("$FreeBSD$");
#include <pci/if_dcreg.h>
MODULE_DEPEND(dc, pci, 1, 1, 1);
MODULE_DEPEND(dc, ether, 1, 1, 1);
MODULE_DEPEND(dc, miibus, 1, 1, 1);
/* "controller miibus0" required. See GENERIC if you get errors here. */
@ -306,8 +308,8 @@ SYSCTL_INT(_hw, OID_AUTO, dc_quick, CTLFLAG_RW,
&dc_quick,0,"do not mdevget in dc driver");
#endif
DRIVER_MODULE(if_dc, cardbus, dc_driver, dc_devclass, 0, 0);
DRIVER_MODULE(if_dc, pci, dc_driver, dc_devclass, 0, 0);
DRIVER_MODULE(dc, cardbus, dc_driver, dc_devclass, 0, 0);
DRIVER_MODULE(dc, pci, dc_driver, dc_devclass, 0, 0);
DRIVER_MODULE(miibus, dc, miibus_driver, miibus_devclass, 0, 0);
#define DC_SETBIT(sc, reg, x) \

View File

@ -5259,4 +5259,4 @@ static driver_t tulip_pci_driver = {
sizeof(tulip_softc_t),
};
static devclass_t tulip_devclass;
DRIVER_MODULE(if_de, pci, tulip_pci_driver, tulip_devclass, 0, 0);
DRIVER_MODULE(de, pci, tulip_pci_driver, tulip_devclass, 0, 0);

View File

@ -481,5 +481,5 @@ static driver_t en_driver = {
static devclass_t en_devclass;
DRIVER_MODULE(if_en, pci, en_driver, en_devclass, 0, 0);
DRIVER_MODULE(en, pci, en_driver, en_devclass, 0, 0);

View File

@ -87,6 +87,8 @@ __FBSDID("$FreeBSD$");
#include <pci/if_pcnreg.h>
MODULE_DEPEND(pcn, pci, 1, 1, 1);
MODULE_DEPEND(pcn, ether, 1, 1, 1);
MODULE_DEPEND(pcn, miibus, 1, 1, 1);
/* "controller miibus0" required. See GENERIC if you get errors here. */
@ -174,7 +176,7 @@ static driver_t pcn_driver = {
static devclass_t pcn_devclass;
DRIVER_MODULE(if_pcn, pci, pcn_driver, pcn_devclass, 0, 0);
DRIVER_MODULE(pcn, pci, pcn_driver, pcn_devclass, 0, 0);
DRIVER_MODULE(miibus, pcn, miibus_driver, miibus_devclass, 0, 0);
#define PCN_CSR_SETBIT(sc, reg, x) \

View File

@ -111,6 +111,8 @@
#include <pci/pcireg.h>
#include <pci/pcivar.h>
MODULE_DEPEND(rl, pci, 1, 1, 1);
MODULE_DEPEND(rl, ether, 1, 1, 1);
MODULE_DEPEND(rl, miibus, 1, 1, 1);
/* "controller miibus0" required. See GENERIC if you get errors here. */
@ -241,8 +243,8 @@ static driver_t rl_driver = {
static devclass_t rl_devclass;
DRIVER_MODULE(if_rl, pci, rl_driver, rl_devclass, 0, 0);
DRIVER_MODULE(if_rl, cardbus, rl_driver, rl_devclass, 0, 0);
DRIVER_MODULE(rl, pci, rl_driver, rl_devclass, 0, 0);
DRIVER_MODULE(rl, cardbus, rl_driver, rl_devclass, 0, 0);
DRIVER_MODULE(miibus, rl, miibus_driver, miibus_devclass, 0, 0);
#define EE_SET(x) \

View File

@ -118,6 +118,8 @@ __FBSDID("$FreeBSD$");
#include <pci/if_sfreg.h>
MODULE_DEPEND(sf, pci, 1, 1, 1);
MODULE_DEPEND(sf, ether, 1, 1, 1);
MODULE_DEPEND(sf, miibus, 1, 1, 1);
static struct sf_type sf_devs[] = {
@ -203,7 +205,7 @@ static driver_t sf_driver = {
static devclass_t sf_devclass;
DRIVER_MODULE(if_sf, pci, sf_driver, sf_devclass, 0, 0);
DRIVER_MODULE(sf, pci, sf_driver, sf_devclass, 0, 0);
DRIVER_MODULE(miibus, sf, miibus_driver, miibus_devclass, 0, 0);
#define SF_SETBIT(sc, reg, x) \

View File

@ -96,6 +96,8 @@ __FBSDID("$FreeBSD$");
#include <pci/if_sisreg.h>
MODULE_DEPEND(sis, pci, 1, 1, 1);
MODULE_DEPEND(sis, ether, 1, 1, 1);
MODULE_DEPEND(sis, miibus, 1, 1, 1);
/* "controller miibus0" required. See GENERIC if you get errors here. */
@ -199,7 +201,7 @@ static driver_t sis_driver = {
static devclass_t sis_devclass;
DRIVER_MODULE(if_sis, pci, sis_driver, sis_devclass, 0, 0);
DRIVER_MODULE(sis, pci, sis_driver, sis_devclass, 0, 0);
DRIVER_MODULE(miibus, sis, miibus_driver, miibus_devclass, 0, 0);
#define SIS_SETBIT(sc, reg, x) \

View File

@ -107,6 +107,8 @@ __FBSDID("$FreeBSD$");
#include <pci/if_skreg.h>
#include <pci/xmaciireg.h>
MODULE_DEPEND(sk, pci, 1, 1, 1);
MODULE_DEPEND(sk, ether, 1, 1, 1);
MODULE_DEPEND(sk, miibus, 1, 1, 1);
/* "controller miibus0" required. See GENERIC if you get errors here. */
@ -236,7 +238,7 @@ static driver_t sk_driver = {
static devclass_t sk_devclass;
DRIVER_MODULE(if_sk, pci, skc_driver, skc_devclass, 0, 0);
DRIVER_MODULE(sk, pci, skc_driver, skc_devclass, 0, 0);
DRIVER_MODULE(sk, skc, sk_driver, sk_devclass, 0, 0);
DRIVER_MODULE(miibus, sk, miibus_driver, miibus_devclass, 0, 0);

View File

@ -72,6 +72,8 @@ __FBSDID("$FreeBSD$");
#include <pci/if_stereg.h>
MODULE_DEPEND(ste, pci, 1, 1, 1);
MODULE_DEPEND(ste, ether, 1, 1, 1);
MODULE_DEPEND(ste, miibus, 1, 1, 1);
/*
@ -157,7 +159,7 @@ static driver_t ste_driver = {
static devclass_t ste_devclass;
DRIVER_MODULE(if_ste, pci, ste_driver, ste_devclass, 0, 0);
DRIVER_MODULE(ste, pci, ste_driver, ste_devclass, 0, 0);
DRIVER_MODULE(miibus, ste, miibus_driver, miibus_devclass, 0, 0);
#define STE_SETBIT4(sc, reg, x) \

View File

@ -279,7 +279,9 @@ static driver_t ti_driver = {
static devclass_t ti_devclass;
DRIVER_MODULE(if_ti, pci, ti_driver, ti_devclass, 0, 0);
DRIVER_MODULE(ti, pci, ti_driver, ti_devclass, 0, 0);
MODULE_DEPEND(ti, pci, 1, 1, 1);
MODULE_DEPEND(ti, ether, 1, 1, 1);
/* List of Tigon softcs */
static STAILQ_HEAD(ti_softc_list, ti_softc) ti_sc_list;

View File

@ -219,6 +219,8 @@ __FBSDID("$FreeBSD$");
#include <pci/if_tlreg.h>
MODULE_DEPEND(tl, pci, 1, 1, 1);
MODULE_DEPEND(tl, ether, 1, 1, 1);
MODULE_DEPEND(tl, miibus, 1, 1, 1);
/* "controller miibus0" required. See GENERIC if you get errors here. */
@ -352,7 +354,7 @@ static driver_t tl_driver = {
static devclass_t tl_devclass;
DRIVER_MODULE(if_tl, pci, tl_driver, tl_devclass, 0, 0);
DRIVER_MODULE(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)

View File

@ -95,6 +95,8 @@ __FBSDID("$FreeBSD$");
#include <pci/if_vrreg.h>
MODULE_DEPEND(vr, pci, 1, 1, 1);
MODULE_DEPEND(vr, ether, 1, 1, 1);
MODULE_DEPEND(vr, miibus, 1, 1, 1);
/* "controller miibus0" required. See GENERIC if you get errors here. */
@ -200,7 +202,7 @@ static driver_t vr_driver = {
static devclass_t vr_devclass;
DRIVER_MODULE(if_vr, pci, vr_driver, vr_devclass, 0, 0);
DRIVER_MODULE(vr, pci, vr_driver, vr_devclass, 0, 0);
DRIVER_MODULE(miibus, vr, miibus_driver, miibus_devclass, 0, 0);
#define VR_SETBIT(sc, reg, x) \

View File

@ -125,6 +125,8 @@ __FBSDID("$FreeBSD$");
#include <pci/if_wbreg.h>
MODULE_DEPEND(wb, pci, 1, 1, 1);
MODULE_DEPEND(wb, ether, 1, 1, 1);
MODULE_DEPEND(wb, miibus, 1, 1, 1);
/*
@ -218,7 +220,7 @@ static driver_t wb_driver = {
static devclass_t wb_devclass;
DRIVER_MODULE(if_wb, pci, wb_driver, wb_devclass, 0, 0);
DRIVER_MODULE(wb, pci, wb_driver, wb_devclass, 0, 0);
DRIVER_MODULE(miibus, wb, miibus_driver, miibus_devclass, 0, 0);
#define WB_SETBIT(sc, reg, x) \

View File

@ -132,6 +132,8 @@ __FBSDID("$FreeBSD$");
#include <pci/pcireg.h>
#include <pci/pcivar.h>
MODULE_DEPEND(xl, pci, 1, 1, 1);
MODULE_DEPEND(xl, ether, 1, 1, 1);
MODULE_DEPEND(xl, miibus, 1, 1, 1);
/* "controller miibus0" required. See GENERIC if you get errors here. */
@ -292,8 +294,8 @@ static driver_t xl_driver = {
static devclass_t xl_devclass;
DRIVER_MODULE(if_xl, cardbus, xl_driver, xl_devclass, 0, 0);
DRIVER_MODULE(if_xl, pci, xl_driver, xl_devclass, 0, 0);
DRIVER_MODULE(xl, cardbus, xl_driver, xl_devclass, 0, 0);
DRIVER_MODULE(xl, pci, xl_driver, xl_devclass, 0, 0);
DRIVER_MODULE(miibus, xl, miibus_driver, miibus_devclass, 0, 0);
static void

View File

@ -7157,7 +7157,8 @@ static driver_t ncr_driver = {
static devclass_t ncr_devclass;
DRIVER_MODULE(if_ncr, pci, ncr_driver, ncr_devclass, 0, 0);
DRIVER_MODULE(ncr, pci, ncr_driver, ncr_devclass, 0, 0);
MODULE_DEPEND(ncr, pci, 1, 1, 1);
/*=========================================================================*/
#endif /* _KERNEL */

View File

@ -919,6 +919,8 @@ static driver_t viapropm_driver = {
DRIVER_MODULE(viapm, pci, viapm_driver, viapm_devclass, 0, 0);
DRIVER_MODULE(viapropm, pci, viapropm_driver, viapropm_devclass, 0, 0);
MODULE_DEPEND(viapm, pci, 1, 1, 1);
MODULE_DEPEND(viaprom, pci, 1, 1, 1);
MODULE_DEPEND(viapm, iicbb, IICBB_MINVER, IICBB_PREFVER, IICBB_MAXVER);
MODULE_DEPEND(viapropm, smbus, SMBUS_MINVER, SMBUS_PREFVER, SMBUS_MAXVER);
MODULE_VERSION(viapm, 1);

View File

@ -263,3 +263,4 @@ static driver_t xrpu_driver = {
DRIVER_MODULE(xrpu, pci, xrpu_driver, xrpu_devclass, 0, 0);
MODULE_DEPEND(xrpu, pci, 1, 1, 1);