diff options
| author | Warner Losh <imp@FreeBSD.org> | 2003-04-09 22:07:02 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2003-04-09 22:07:02 +0000 |
| commit | 60feb70860d68015bda52b6d7b8694d5abae689e (patch) | |
| tree | 59636cf24aac8d0c4481841338a1da70ba7ddf86 /sys/dev | |
| parent | 685a76429a4b7fd3a50c31b8f11b19be2a0b8670 (diff) | |
Notes
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pccard/pccard.c | 2 | ||||
| -rw-r--r-- | sys/dev/pccard/pccardvar.h | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/sys/dev/pccard/pccard.c b/sys/dev/pccard/pccard.c index f0a2792e35e7..1d4993fa47d8 100644 --- a/sys/dev/pccard/pccard.c +++ b/sys/dev/pccard/pccard.c @@ -339,7 +339,7 @@ pccard_do_product_lookup(device_t bus, device_t dev, return (NULL); if (pccard_get_product_str(dev, &prodstr)) return (NULL); - for (ent = tab; ent->pp_name != NULL || ent->pp_vendor != 0; ent = + for (ent = tab; ent->pp_vendor != 0 && ent->pp_product != 0; ent = (const struct pccard_product *) ((const char *) ent + ent_size)) { matches = 1; if (ent->pp_vendor == PCCARD_VENDOR_ANY && diff --git a/sys/dev/pccard/pccardvar.h b/sys/dev/pccard/pccardvar.h index 553cea59a475..fc09b29169e4 100644 --- a/sys/dev/pccard/pccardvar.h +++ b/sys/dev/pccard/pccardvar.h @@ -373,14 +373,15 @@ enum { #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, \ +#define PCMCIA_CARD_D(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) \ +#define PCMCIA_CARD2_D(v1, p1, p2, f) \ { PCMCIA_STR_ ## p2, PCMCIA_VENDOR_ ## v1, PCCARD_P(v1, p1), \ f, PCMCIA_CIS_ ## p2} -#define PCMCIA_CARD_ND(v, p, f) { NULL, PCMCIA_VENDOR_ ## v, \ +#if 1 +#define PCMCIA_CARD(v, p, f) { NULL, PCMCIA_VENDOR_ ## v, \ PCCARD_P(v, p), f, PCCARD_C(v, p) } -#define PCMCIA_CARD2_ND(v1, p1, p2, f) \ +#define PCMCIA_CARD2(v1, p1, p2, f) \ { NULL, PCMCIA_VENDOR_ ## v1, PCCARD_P(v1, p1), \ f, PCMCIA_CIS_ ## p2} - +#endif |