diff options
| author | imp <imp@FreeBSD.org> | 1999-12-08 07:55:20 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 1999-12-08 07:55:20 +0000 |
| commit | 4673fb11c389f5466612ea4c6e8f908cc18696d8 (patch) | |
| tree | 3519df9dfdc6dbff979b635f6afe002da20b44ad /sys/pccard/slot.h | |
| parent | 6cc83bf12d28839afac51843a5dbddce2ef3feb3 (diff) | |
| download | FreeBSD-src-4673fb11c389f5466612ea4c6e8f908cc18696d8.zip FreeBSD-src-4673fb11c389f5466612ea4c6e8f908cc18696d8.tar.gz | |
Switch to using suspend/resume methods rather than the APM hooks.
Should have no effect, but does make things a little cleaner. I
thought this was the race that was causing problems, but it turned out
to be in pccardd waking up after the empty/insert events had happened
and being confused.
Minor cleanup:
o Remove isahd from pccard_devinfo
o remove extra from controller
o formatting nits
o use PCCARD_DEVINFO(d) rather than a bare device_get_ivars(d)
Diffstat (limited to 'sys/pccard/slot.h')
| -rw-r--r-- | sys/pccard/slot.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/pccard/slot.h b/sys/pccard/slot.h index a987f83..07c9907 100644 --- a/sys/pccard/slot.h +++ b/sys/pccard/slot.h @@ -69,7 +69,6 @@ struct slot_ctrl { /* Map interrupt number */ void (*resume) __P((struct slot *)); /* suspend/resume support */ - int extra; /* Controller specific size */ int maxmem; /* Number of allowed memory windows */ int maxio; /* Number of allowed I/O windows */ @@ -89,7 +88,6 @@ struct slot_ctrl { */ struct pccard_devinfo { u_char name[128]; - struct isa_device isahd; int running; /* Current state of driver */ u_char misc[128]; /* For any random info */ struct slot *slt; /* Back pointer to slot */ @@ -128,5 +126,7 @@ enum card_event { card_removed, card_inserted }; struct slot *pccard_alloc_slot(struct slot_ctrl *); void pccard_event(struct slot *, enum card_event); +int pccard_suspend(device_t); +int pccard_resume(device_t); #endif /* !_PCCARD_SLOT_H */ |
