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

o Dike out the bogus reprobe stuff. It was getting in the way of newbus' own

Browse Source 
reprobe code working.  This bogusness was thrust upon me.
o Don't delete the device if no drivers attach.  I had thrust this bogusness
  upon others.

These two changes make kldload of a pccard driver work again.
This commit is contained in:
imp 2002-09-10 06:32:18 +00:00
parent 000f7cdc53
commit f37511889c
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/dev/pccard/card_if.m
View File

@ -93,15 +93,6 @@ METHOD int detach_card {
int flags;
}
#
# pccard/cardbus buses call this to request a reprobe of the bus.
# reprobe only initiated if the child bus is the same type the card inserted.
#
METHOD int reprobe_card {
device_t dev;
device_t child;
}
HEADER {
#define DETACH_FORCE 0x01
}

7
sys/dev/pccard/pccard.c
View File

@ -248,8 +248,6 @@ pccard_attach_card(device_t dev)
pccard_function_disable(pf);
}
}
if (sc->sc_enabled_count == 0)
pccard_detach_card(dev, 0);
return (0);
}
@ -975,11 +973,6 @@ pccard_driver_added(device_t dev, driver_t *driver)
struct pccard_function *pf;
device_t child;
if (sc->sc_enabled_count == 0) {
CARD_REPROBE_CARD(device_get_parent(dev), dev);
return;
}
STAILQ_FOREACH(pf, &sc->card.pf_head, pf_list) {
if (STAILQ_EMPTY(&pf->cfe_head))
continue;