diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-08-08 01:00:16 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-08-08 01:00:16 +0000 |
| commit | a6833536653e21a3adece6249320e89dea0647f3 (patch) | |
| tree | e72e3e5717aaad246a9e91df3f7cd8dea5f2a879 /sys/dev/pcmcia/pcmciavar.h | |
| parent | e09cf6c78cf6abfe9238df036609a770d07895c7 (diff) | |
Support detaching. Support CIS-less cards. Style police.
Diffstat (limited to 'sys/dev/pcmcia/pcmciavar.h')
| -rw-r--r-- | sys/dev/pcmcia/pcmciavar.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sys/dev/pcmcia/pcmciavar.h b/sys/dev/pcmcia/pcmciavar.h index 8432ac08fa6..18748da441e 100644 --- a/sys/dev/pcmcia/pcmciavar.h +++ b/sys/dev/pcmcia/pcmciavar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pcmciavar.h,v 1.10 1999/07/20 21:51:21 fgsch Exp $ */ +/* $OpenBSD: pcmciavar.h,v 1.11 1999/08/08 01:00:15 niklas Exp $ */ /* $NetBSD: pcmciavar.h,v 1.5 1998/07/19 17:28:17 christos Exp $ */ /* @@ -117,6 +117,7 @@ struct pcmcia_function { SIMPLEQ_ENTRY(pcmcia_function) pf_list; /* run-time state */ struct pcmcia_softc *sc; + struct device *child; struct pcmcia_config_entry *cfe; struct pcmcia_mem_handle pf_pcmh; #define pf_ccrt pf_pcmh.memt @@ -135,6 +136,7 @@ struct pcmcia_function { /* pf_flags */ #define PFF_ENABLED 0x0001 /* function is enabled */ +#define PFF_FAKE 0x0002 /* function is made up (no CIS) */ struct pcmcia_card { int cis1_major; @@ -259,6 +261,12 @@ void pcmcia_function_disable __P((struct pcmcia_function *)); int pcmcia_io_map __P((struct pcmcia_function *, int, bus_addr_t, bus_size_t, struct pcmcia_io_handle *, int *)); +#define pcmcia_io_unmap(pf, window) \ + (pcmcia_chip_io_unmap((pf)->sc->pct, (pf)->sc->pch, (window))) + +#define pcmcia_io_free(pf, pciop) \ + (pcmcia_chip_io_free((pf)->sc->pct, (pf)->sc->pch, (pciop))) + #define pcmcia_mem_alloc(pf, size, pcmhp) \ (pcmcia_chip_mem_alloc((pf)->sc->pct, (pf)->sc->pch, (size), (pcmhp))) |