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

Save a pointer to the dev, if any, that each function attach.

Browse Source 
Remove some bogus printfs.
This commit is contained in:
Warner Losh 2000-08-22 04:25:57 +00:00
parent ca7b35bdbf
commit bd6dd21e8d
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,11 +133,11 @@ pccard_attach_card(device_t dev)
if (STAILQ_EMPTY(&pf->cfe_head))
continue;
printf ("pf %p sc %p\n", pf, sc);
pf->sc = sc;
pf->cfe = NULL;
pf->ih_fct = NULL;
pf->ih_arg = NULL;
pf->dev = NULL;
}
DEVPRINTF((dev, "chip_socket_disable\n"));
@ -165,6 +165,7 @@ pccard_attach_card(device_t dev)
device_printf(dev, "pf %p pf->sc %p\n", pf, pf->sc);
if (device_probe_and_attach(child) == 0) {
attached++;
pf->dev = child;
DEVPRINTF((sc->dev, "function %d CCR at %d "
"offset %x: %x %x %x %x, %x %x %x %x, %x\n",
@ -194,7 +195,8 @@ pccard_detach_card(device_t dev, int flags)
continue;
pccard_function_disable(pf);
device_delete_child(device_get_parent(dev), dev);
if (pf->dev)
device_delete_child(dev, pf->dev);
}
return 0;
}
@ -690,3 +692,5 @@ DRIVER_MODULE(pccard, pcic, pccard_driver, pccard_devclass, 0, 0);
DRIVER_MODULE(pccard, pc98pcic, pccard_driver, pccard_devclass, 0, 0);
DRIVER_MODULE(pccard, pccbb, pccard_driver, pccard_devclass, 0, 0);
DRIVER_MODULE(pccard, tcic, pccard_driver, pccard_devclass, 0, 0);
MODULE_VERSION(pccard, 1);
MODULE_DEPEND(pccard, pcic, 1, 1, 1);

1
sys/dev/pccard/pccardvar.h
View File

@ -121,6 +121,7 @@ struct pccard_function {
struct pccard_softc *sc;
struct pccard_config_entry *cfe;
struct pccard_mem_handle pf_pcmh;
device_t dev;
#define pf_ccrt pf_pcmh.memt
#define pf_ccrh pf_pcmh.memh
#define pf_ccr_realsize pf_pcmh.realsize