Deleted Added
full compact
pccardvar.h (113308) pccardvar.h (113322)
1/* $NetBSD: pcmciavar.h,v 1.12 2000/02/08 12:51:31 enami Exp $ */
1/* $NetBSD: pcmciavar.h,v 1.12 2000/02/08 12:51:31 enami Exp $ */
2/* $FreeBSD: head/sys/dev/pccard/pccardvar.h 113308 2003-04-09 22:10:28Z imp $ */
2/* $FreeBSD: head/sys/dev/pccard/pccardvar.h 113322 2003-04-10 07:21:11Z imp $ */
3
4/*
5 * Copyright (c) 1997 Marc Horowitz. All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions
9 * are met:
10 * 1. Redistributions of source code must retain the above copyright

--- 357 unchanged lines hidden (view full) ---

368};
369
370#define PCCARD_SOFTC(d) (struct pccard_softc *) device_get_softc(d)
371#define PCCARD_IVAR(d) (struct pccard_ivar *) device_get_ivars(d)
372
373#define PCCARD_S(a, b) PCMCIA_STR_ ## a ## _ ## b
374#define PCCARD_P(a, b) PCMCIA_PRODUCT_ ## a ## _ ## b
375#define PCCARD_C(a, b) PCMCIA_CIS_ ## a ## _ ## b
3
4/*
5 * Copyright (c) 1997 Marc Horowitz. All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions
9 * are met:
10 * 1. Redistributions of source code must retain the above copyright

--- 357 unchanged lines hidden (view full) ---

368};
369
370#define PCCARD_SOFTC(d) (struct pccard_softc *) device_get_softc(d)
371#define PCCARD_IVAR(d) (struct pccard_ivar *) device_get_ivars(d)
372
373#define PCCARD_S(a, b) PCMCIA_STR_ ## a ## _ ## b
374#define PCCARD_P(a, b) PCMCIA_PRODUCT_ ## a ## _ ## b
375#define PCCARD_C(a, b) PCMCIA_CIS_ ## a ## _ ## b
376#define PCMCIA_CARD(v, p, f) { PCCARD_S(v, p), PCMCIA_VENDOR_ ## v, \
376#define PCMCIA_CARD_D(v, p, f) { PCCARD_S(v, p), PCMCIA_VENDOR_ ## v, \
377 PCCARD_P(v, p), f, PCCARD_C(v, p) }
377 PCCARD_P(v, p), f, PCCARD_C(v, p) }
378#define PCMCIA_CARD2(v1, p1, p2, f) \
378#define PCMCIA_CARD2_D(v1, p1, p2, f) \
379 { PCMCIA_STR_ ## p2, PCMCIA_VENDOR_ ## v1, PCCARD_P(v1, p1), \
380 f, PCMCIA_CIS_ ## p2}
379 { PCMCIA_STR_ ## p2, PCMCIA_VENDOR_ ## v1, PCCARD_P(v1, p1), \
380 f, PCMCIA_CIS_ ## p2}
381#define PCMCIA_CARD_ND(v, p, f) { NULL, PCMCIA_VENDOR_ ## v, \
381#if 1
382#define PCMCIA_CARD(v, p, f) { NULL, PCMCIA_VENDOR_ ## v, \
382 PCCARD_P(v, p), f, PCCARD_C(v, p) }
383 PCCARD_P(v, p), f, PCCARD_C(v, p) }
383#define PCMCIA_CARD2_ND(v1, p1, p2, f) \
384#define PCMCIA_CARD2(v1, p1, p2, f) \
384 { NULL, PCMCIA_VENDOR_ ## v1, PCCARD_P(v1, p1), \
385 f, PCMCIA_CIS_ ## p2}
385 { NULL, PCMCIA_VENDOR_ ## v1, PCCARD_P(v1, p1), \
386 f, PCMCIA_CIS_ ## p2}
386
387#endif