diff options
| author | imp <imp@FreeBSD.org> | 2001-11-15 06:37:13 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2001-11-15 06:37:13 +0000 |
| commit | 686e52b5ce1d549cff8470765d91c80fc45f6892 (patch) | |
| tree | 0a04563b6b102945284ed1324e03188286ae1bd5 /sys/dev/pccard/pccardvar.h | |
| parent | 9777457eaf485a93ccbb5de9c511a007ea2e6d0c (diff) | |
| download | FreeBSD-src-686e52b5ce1d549cff8470765d91c80fc45f6892.zip FreeBSD-src-686e52b5ce1d549cff8470765d91c80fc45f6892.tar.gz | |
Hoist the Card/Card2 macros that I invented for the wi driver into
pccard layer and rename them PCMCIA_CARD and PCMCIA_CARD2 respectively
(note, this is being done with an eye towards NetBSD integreation so
it is easier to keep lists of cards between us and them in sync).
Use this in the an and wi drivers.
Diffstat (limited to 'sys/dev/pccard/pccardvar.h')
| -rw-r--r-- | sys/dev/pccard/pccardvar.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sys/dev/pccard/pccardvar.h b/sys/dev/pccard/pccardvar.h index e75fe3a..8806349 100644 --- a/sys/dev/pccard/pccardvar.h +++ b/sys/dev/pccard/pccardvar.h @@ -356,3 +356,13 @@ enum { #define PCCARD_SOFTC(d) (struct pccard_softc *) device_get_softc(d) #define PCCARD_IVAR(d) (struct pccard_ivar *) device_get_ivars(d) + +#define PCCARD_S(a, b) PCMCIA_STR_ ## a ## _ ## b +#define PCCARD_P(a, b) PCMCIA_PRODUCT_ ## a ## _ ## b +#define PCCARD_C(a, b) PCMCIA_CIS_ ## a ## _ ## b +#define PCMCIA_CARD(v, p, f) { PCCARD_S(v, p), PCMCIA_VENDOR_ ## v, \ + PCCARD_P(v, p), f, PCCARD_C(v, p) } +#define PCMCIA_CARD2(v1, p1, p2, f) \ + { PCMCIA_STR_ ## p2, PCMCIA_VENDOR_ ## v1, PCCARD_P(v1, p1), \ + f, PCMCIA_CIS_ ## p2} + |
