It turns out that the module dependency on pccard is in error. Since

there's not dependencies on pccard symboles, such a dependency is not
necessary.  This means that drivers that have multiple attachments can
not drag bogus devices into the kernel at load time.

We can't (yet) do this with pci and isa.  Drivers written for them
actually do seem to have symbols that depend on these busses'
implementation code.

ndis not touched until other things can be tested.
This commit is contained in:
Warner Losh 2004-05-08 06:04:06 +00:00
parent e5728f83a0
commit fbfb97942e
6 changed files with 0 additions and 6 deletions

View file

@ -105,7 +105,6 @@ static devclass_t an_pccard_devclass;
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

@ -301,4 +301,3 @@ extern devclass_t awi_devclass;
DRIVER_MODULE(awi, pccard, awi_pccard_driver, awi_devclass, 0, 0);
MODULE_DEPEND(awi, wlan, 1, 1, 1);
MODULE_DEPEND(awi, pccard, 1, 1, 1);

View file

@ -65,7 +65,6 @@
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.

View file

@ -169,5 +169,4 @@ static driver_t sn_pccard_driver = {
extern devclass_t sn_devclass;
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

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

@ -120,7 +120,6 @@ static driver_t wi_pccard_driver = {
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[] = {