diff options
| author | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 1999-08-13 20:36:39 +0000 |
|---|---|---|
| committer | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 1999-08-13 20:36:39 +0000 |
| commit | 0d782bf37fe0c3908bd049aa6fa1a6c0bdaca6e6 (patch) | |
| tree | 1d9484a6ed0578d295e6059d45aba4699aede9bd /sys/dev | |
| parent | 66ed7cdad45b0ea82b0c8abd22f8f414024d7c83 (diff) | |
Use macros defined in pcmciavar.h.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pcmcia/if_wi.c | 11 | ||||
| -rw-r--r-- | sys/dev/pcmcia/if_xe.c | 7 |
2 files changed, 8 insertions, 10 deletions
diff --git a/sys/dev/pcmcia/if_wi.c b/sys/dev/pcmcia/if_wi.c index a959b18de47..c6746c23a0b 100644 --- a/sys/dev/pcmcia/if_wi.c +++ b/sys/dev/pcmcia/if_wi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wi.c,v 1.2 1999/08/08 01:17:23 niklas Exp $ */ +/* $OpenBSD: if_wi.c,v 1.3 1999/08/13 20:36:38 fgsch Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -176,9 +176,9 @@ u_int32_t widebug = WIDEBUG; #if !defined(lint) static const char rcsid[] = #ifdef __FreeBSD__ - "$Id: if_wi.c,v 1.2 1999/08/08 01:17:23 niklas Exp $"; + "$Id: if_wi.c,v 1.3 1999/08/13 20:36:38 fgsch Exp $"; #else /* !__FreeBSD__ */ - "$OpenBSD: if_wi.c,v 1.2 1999/08/08 01:17:23 niklas Exp $"; + "$OpenBSD: if_wi.c,v 1.3 1999/08/13 20:36:38 fgsch Exp $"; #endif /* __FreeBSD__ */ #endif /* lint */ @@ -620,10 +620,9 @@ wi_pcmcia_attach(parent, self, aux) bad: if (state > 2) - pcmcia_chip_io_unmap(pf->sc->pct, pf->sc->pch, - sc->sc_io_window); + pcmcia_io_unmap(pf, sc->sc_io_window); if (state > 1) - pcmcia_chip_io_free(pf->sc->pct, pf->sc->pch, &sc->sc_pcioh); + pcmcia_io_free(pf, &sc->sc_pcioh); if (state > 0) pcmcia_function_disable(pf); } diff --git a/sys/dev/pcmcia/if_xe.c b/sys/dev/pcmcia/if_xe.c index 1368fe6434f..a92ff94e315 100644 --- a/sys/dev/pcmcia/if_xe.c +++ b/sys/dev/pcmcia/if_xe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_xe.c,v 1.7 1999/08/09 03:54:01 fgsch Exp $ */ +/* $OpenBSD: if_xe.c,v 1.8 1999/08/13 20:36:38 fgsch Exp $ */ /* * Copyright (c) 1999 Niklas Hallqvist, C Stone, Job de Haas @@ -445,10 +445,9 @@ xe_pcmcia_attach(parent, self, aux) bad: if (state > 2) - pcmcia_chip_io_unmap(pf->sc->pct, pf->sc->pch, - psc->sc_io_window); + pcmcia_io_unmap(pf, psc->sc_io_window); if (state > 1) - pcmcia_chip_io_free(pf->sc->pct, pf->sc->pch, &psc->sc_pcioh); + pcmcia_io_free(pf, &psc->sc_pcioh); if (state > 0) pcmcia_function_disable(pa->pf); free(cfe, M_DEVBUF); |