diff options
author | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 1999-03-04 05:53:47 +0000 |
---|---|---|
committer | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 1999-03-04 05:53:47 +0000 |
commit | f4991c2dcdbede1c3031e04cc80a6e7d56d0ca04 (patch) | |
tree | ec730379e6d3c2fc4816ca31e7b16c2b51f1ded0 /sys/dev/pcmcia | |
parent | 1f20c7a51ffbcbfdf14b6901e48124402cbaae27 (diff) |
sync.
Diffstat (limited to 'sys/dev/pcmcia')
-rw-r--r-- | sys/dev/pcmcia/pcmciadevs.h | 15 | ||||
-rw-r--r-- | sys/dev/pcmcia/pcmciadevs_data.h | 29 |
2 files changed, 27 insertions, 17 deletions
diff --git a/sys/dev/pcmcia/pcmciadevs.h b/sys/dev/pcmcia/pcmciadevs.h index 990c039a617..1cb013b838c 100644 --- a/sys/dev/pcmcia/pcmciadevs.h +++ b/sys/dev/pcmcia/pcmciadevs.h @@ -1,10 +1,10 @@ -/* $OpenBSD: pcmciadevs.h,v 1.11 1999/02/03 19:24:51 deraadt Exp $ */ +/* $OpenBSD: pcmciadevs.h,v 1.12 1999/03/04 05:53:46 fgsch Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: pcmciadevs,v 1.9 1999/01/31 11:28:39 fgsch Exp + * OpenBSD: pcmciadevs,v 1.10 1999/03/04 05:50:28 fgsch Exp */ /* $NetBSD: pcmciadevs,v 1.13 1998/08/17 23:10:12 thorpej Exp $ */ @@ -64,7 +64,7 @@ #define PCMCIA_VENDOR_KINGSTON 0x0186 /* Kingston */ #define PCMCIA_VENDOR_DAYNA 0x0194 /* Dayna */ #define PCMCIA_VENDOR_IODATA 0x01bf /* I-O DATA */ -#define PCMCIA_VENDOR_COMPEX 0x8a01 /* Compex Corporation */ +#define PCMCIA_VENDOR_COMPEX 0x8a01 /* Compex */ #define PCMCIA_VENDOR_COREGA 0xc00f /* Corega K.K. */ #define PCMCIA_VENDOR_HAGIWARASYSCOM 0xc012 /* Hagiwara SYS-COM */ @@ -149,15 +149,18 @@ #define PCMCIA_STR_KINGSTON_KNE_PC2 "Kingston KNE-PC2" /* Linksys corporation */ +#define PCMCIA_CIS_LINKSYS_TRUST_COMBO_ECARD { NULL, NULL, NULL, NULL } +#define PCMCIA_PRODUCT_LINKSYS_TRUST_COMBO_ECARD 0x021b +#define PCMCIA_STR_LINKSYS_TRUST_COMBO_ECARD "Trust (Linksys) Combo EthernetCard" +#define PCMCIA_CIS_LINKSYS_FAST_ECARD { NULL, NULL, NULL, NULL } +#define PCMCIA_PRODUCT_LINKSYS_FAST_ECARD 0x0230 +#define PCMCIA_STR_LINKSYS_FAST_ECARD "D-Link DFE-650 or Netgear FA410TX" #define PCMCIA_CIS_LINKSYS_ECARD_1 { NULL, NULL, NULL, NULL } #define PCMCIA_PRODUCT_LINKSYS_ECARD_1 0x0265 #define PCMCIA_STR_LINKSYS_ECARD_1 "Linksys EthernetCard or D-Link DE-650" #define PCMCIA_CIS_LINKSYS_COMBO_ECARD { NULL, NULL, NULL, NULL } #define PCMCIA_PRODUCT_LINKSYS_COMBO_ECARD 0xc1ab #define PCMCIA_STR_LINKSYS_COMBO_ECARD "Linksys Combo EthernetCard" -#define PCMCIA_CIS_LINKSYS_TRUST_COMBO_ECARD { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_LINKSYS_TRUST_COMBO_ECARD 0x021b -#define PCMCIA_STR_LINKSYS_TRUST_COMBO_ECARD "Trust (Linksys) Combo EthernetCard" /* Megahertz Products */ #define PCMCIA_CIS_MEGAHERTZ_XJ4288 { NULL, NULL, NULL, NULL } diff --git a/sys/dev/pcmcia/pcmciadevs_data.h b/sys/dev/pcmcia/pcmciadevs_data.h index 8a5f366fad1..ada3202101c 100644 --- a/sys/dev/pcmcia/pcmciadevs_data.h +++ b/sys/dev/pcmcia/pcmciadevs_data.h @@ -1,10 +1,10 @@ -/* $OpenBSD: pcmciadevs_data.h,v 1.11 1999/02/03 19:24:51 deraadt Exp $ */ +/* $OpenBSD: pcmciadevs_data.h,v 1.12 1999/03/04 05:53:46 fgsch Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: pcmciadevs,v 1.9 1999/01/31 11:28:39 fgsch Exp + * OpenBSD: pcmciadevs,v 1.10 1999/03/04 05:50:28 fgsch Exp */ /* $NetBSD: pcmciadevs,v 1.13 1998/08/17 23:10:12 thorpej Exp $ */ @@ -86,7 +86,7 @@ struct pcmcia_knowndev pcmcia_knowndevs[] = { PCMCIA_VENDOR_COMPEX, PCMCIA_PRODUCT_COMPEX_LINKPORT_ENET_B, PCMCIA_CIS_COMPEX_LINKPORT_ENET_B, 0, - "Compex Corporation", + "Compex", "Compex Linkport ENET-B Ethernet" }, }, { @@ -174,6 +174,20 @@ struct pcmcia_knowndev pcmcia_knowndevs[] = { "Kingston KNE-PC2" }, }, { + PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_TRUST_COMBO_ECARD, + PCMCIA_CIS_LINKSYS_TRUST_COMBO_ECARD, + 0, + "Linksys", + "Trust (Linksys) Combo EthernetCard" }, + }, + { + PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_FAST_ECARD, + PCMCIA_CIS_LINKSYS_FAST_ECARD, + 0, + "Linksys", + "D-Link DFE-650 or Netgear FA410TX" }, + }, + { PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_ECARD_1, PCMCIA_CIS_LINKSYS_ECARD_1, 0, @@ -188,13 +202,6 @@ struct pcmcia_knowndev pcmcia_knowndevs[] = { "Linksys Combo EthernetCard" }, }, { - PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_TRUST_COMBO_ECARD, - PCMCIA_CIS_LINKSYS_TRUST_COMBO_ECARD, - 0, - "Linksys", - "Trust (Linksys) Combo EthernetCard" }, - }, - { PCMCIA_VENDOR_MEGAHERTZ, PCMCIA_PRODUCT_MEGAHERTZ_XJ4288, PCMCIA_CIS_MEGAHERTZ_XJ4288, 0, @@ -569,7 +576,7 @@ struct pcmcia_knowndev pcmcia_knowndevs[] = { PCMCIA_VENDOR_COMPEX, 0, PCMCIA_KNOWNDEV_NOPROD, PCMCIA_CIS_INVALID, - "Compex Corporation", + "Compex", NULL, }, { |