diff options
Diffstat (limited to 'sys/dev/pcmcia')
| -rw-r--r-- | sys/dev/pcmcia/aic_pcmcia.c | 76 | ||||
| -rw-r--r-- | sys/dev/pcmcia/com_pcmcia.c | 4 | ||||
| -rw-r--r-- | sys/dev/pcmcia/if_ne_pcmcia.c | 89 | ||||
| -rw-r--r-- | sys/dev/pcmcia/if_sm_pcmcia.c | 10 | ||||
| -rw-r--r-- | sys/dev/pcmcia/pcmciadevs | 21 | ||||
| -rw-r--r-- | sys/dev/pcmcia/pcmciadevs.h | 41 | ||||
| -rw-r--r-- | sys/dev/pcmcia/pcmciadevs_data.h | 73 |
7 files changed, 232 insertions, 82 deletions
diff --git a/sys/dev/pcmcia/aic_pcmcia.c b/sys/dev/pcmcia/aic_pcmcia.c index 2831f1d84b1..750d87ef8be 100644 --- a/sys/dev/pcmcia/aic_pcmcia.c +++ b/sys/dev/pcmcia/aic_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aic_pcmcia.c,v 1.1 1998/09/11 10:47:14 fgsch Exp $ */ +/* $OpenBSD: aic_pcmcia.c,v 1.2 1998/10/14 07:34:43 fgsch Exp $ */ /* $NetBSD: aic_pcmcia.c,v 1.6 1998/07/19 17:28:15 christos Exp $ */ /* @@ -67,6 +67,37 @@ struct cfattach aic_pcmcia_ca = { sizeof(struct aic_pcmcia_softc), aic_pcmcia_match, aic_pcmcia_attach }; +struct aic_pcmcia_product { + u_int32_t app_vendor; /* PCMCIA vendor ID */ + u_int32_t app_product; /* PCMCIA product ID */ + int app_expfunc; /* expected function number */ + const char *app_name; /* device name */ +} aic_pcmcia_products[] = { + { PCMCIA_VENDOR_ADAPTEC, PCMCIA_PRODUCT_ADAPTEC_APA1460_1, + 0, PCMCIA_STR_ADAPTEC_APA1460_1 }, + { PCMCIA_VENDOR_ADAPTEC, PCMCIA_PRODUCT_ADAPTEC_APA1460_2, + 0, PCMCIA_STR_ADAPTEC_APA1460_2 }, + { 0, 0, + 0, NULL }, +}; + +struct aic_pcmcia_product *aic_pcmcia_lookup __P((struct pcmcia_attach_args *)); + +struct aic_pcmcia_product * +aic_pcmcia_lookup(pa) + struct pcmcia_attach_args *pa; +{ + struct aic_pcmcia_product *app; + + for (app = aic_pcmcia_products; app->app_name != NULL; app++) { + if (pa->manufacturer == app->app_vendor && + pa->product == app->app_product && + pa->pf->number == app->app_expfunc) + return (app); + } + return (NULL); +} + int aic_pcmcia_match(parent, match, aux) struct device *parent; @@ -74,15 +105,8 @@ aic_pcmcia_match(parent, match, aux) { struct pcmcia_attach_args *pa = aux; - if (pa->manufacturer == PCMCIA_VENDOR_ADAPTEC) { - switch (pa->product) { - case PCMCIA_PRODUCT_ADAPTEC_APA1460_1: - case PCMCIA_PRODUCT_ADAPTEC_APA1460_2: - if (pa->pf->number == 0) - return (1); - } - } - + if (aic_pcmcia_lookup(pa) != NULL) + return (1); return (0); } @@ -96,7 +120,9 @@ aic_pcmcia_attach(parent, self, aux) struct pcmcia_attach_args *pa = aux; struct pcmcia_config_entry *cfe; struct pcmcia_function *pf = pa->pf; - const char *s; +#if 0 + struct aic_pcmcia_product *app; +#endif psc->sc_pf = pf; @@ -133,22 +159,22 @@ aic_pcmcia_attach(parent, self, aux) return; } - if (!aic_find(sc->sc_iot, sc->sc_ioh)) - printf(": coundn't find aic\n%s", sc->sc_dev.dv_xname); - - switch (pa->product) { - case PCMCIA_PRODUCT_ADAPTEC_APA1460_1: - s = PCMCIA_STR_ADAPTEC_APA1460_1; - break; - case PCMCIA_PRODUCT_ADAPTEC_APA1460_2: - s = PCMCIA_STR_ADAPTEC_APA1460_2; - break; - default: - s = "Unknown APA1460"; - break; + if (!aic_find(sc->sc_iot, sc->sc_ioh)) { + printf(": unable to detect chip!\n"); + return; + } + +#if 0 + app = aic_pcmcia_lookup(pa); + if (app == NULL) { + printf("\n"); + panic("aic_pcmcia_attach: impossible"); } - printf(": %s\n", s); + printf(": %s\n", app->app_name); +#else + printf("\n"); +#endif aicattach(sc); diff --git a/sys/dev/pcmcia/com_pcmcia.c b/sys/dev/pcmcia/com_pcmcia.c index 02576518c8d..94fc99eb1b3 100644 --- a/sys/dev/pcmcia/com_pcmcia.c +++ b/sys/dev/pcmcia/com_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: com_pcmcia.c,v 1.4 1998/09/11 10:47:14 fgsch Exp $ */ +/* $OpenBSD: com_pcmcia.c,v 1.5 1998/10/14 07:34:43 fgsch Exp $ */ /* $NetBSD: com_pcmcia.c,v 1.15 1998/08/22 17:47:58 msaitoh Exp $ */ /*- @@ -294,11 +294,9 @@ found: sc->enable = com_pcmcia_enable; sc->disable = com_pcmcia_disable; -#endif printf(": serial device"); -#ifdef notyet com_attach_subr(sc); #endif com_attach(sc); diff --git a/sys/dev/pcmcia/if_ne_pcmcia.c b/sys/dev/pcmcia/if_ne_pcmcia.c index 44da70fb31f..16c678e7af5 100644 --- a/sys/dev/pcmcia/if_ne_pcmcia.c +++ b/sys/dev/pcmcia/if_ne_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ne_pcmcia.c,v 1.1 1998/09/22 09:16:36 fgsch Exp $ */ +/* $OpenBSD: if_ne_pcmcia.c,v 1.2 1998/10/14 07:34:43 fgsch Exp $ */ /* $NetBSD: if_ne_pcmcia.c,v 1.17 1998/08/15 19:00:04 thorpej Exp $ */ /* @@ -94,31 +94,11 @@ struct ne2000dev { PCMCIA_CIS_PREMAX_PE200, 0, 0x07f0, { 0x00, 0x20, 0xe0 } }, - { PCMCIA_STR_IBM_INFOMOVER, - PCMCIA_VENDOR_IBM, PCMCIA_PRODUCT_IBM_INFOMOVER, - PCMCIA_CIS_IBM_INFOMOVER, - 0, 0x0ff0, { 0x08, 0x00, 0x5a } }, - { PCMCIA_STR_DIGITAL_DEPCMXX, PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, PCMCIA_CIS_DIGITAL_DEPCMXX, 0, 0x0ff0, { 0x00, 0x00, 0xe8 } }, - { PCMCIA_STR_LINKSYS_ECARD, - PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_ECARD, - PCMCIA_CIS_LINKSYS_ECARD, - 0, -1, { 0x00, 0x80, 0xc8 } }, - - { PCMCIA_STR_LINKSYS_COMBO_ECARD, - PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_COMBO_ECARD, - PCMCIA_CIS_LINKSYS_COMBO_ECARD, - 0, -1, { 0x00, 0x80, 0xc8 } }, - - { PCMCIA_STR_LINKSYS_TRUST_COMBO_ECARD, - PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_TRUST_COMBO_ECARD, - PCMCIA_CIS_LINKSYS_TRUST_COMBO_ECARD, - 0, 0x0120, { 0x20, 0x04, 0x49 } }, - { PCMCIA_STR_PLANET_SMARTCOM2000, PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, PCMCIA_CIS_PLANET_SMARTCOM2000, @@ -134,17 +114,6 @@ struct ne2000dev { PCMCIA_CIS_DLINK_DE660, 0, -1, { 0x00, 0x80, 0xc8 } }, - { PCMCIA_STR_IODATA_PCLAT, - PCMCIA_VENDOR_IODATA, PCMCIA_PRODUCT_IODATA_PCLAT, - PCMCIA_CIS_IODATA_PCLAT, - /* two possible location, 0x01c0 or 0x0ff0 */ - 0, -1, { 0x00, 0xa0, 0xb0 } }, - - { PCMCIA_STR_DAYNA_COMMUNICARD_E, - PCMCIA_VENDOR_DAYNA, PCMCIA_PRODUCT_DAYNA_COMMUNICARD_E, - PCMCIA_CIS_DAYNA_COMMUNICARD_E, - 0, 0x0110, { 0x00, 0x80, 0x19 } }, - { PCMCIA_STR_RPTI_EP401, PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, PCMCIA_CIS_RPTI_EP401, @@ -154,6 +123,62 @@ struct ne2000dev { PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, PCMCIA_CIS_ACCTON_EN2212, 0, 0x0ff0, { 0x00, 0x00, 0xe8 } }, + + /* + * You have to add new entries which contains + * PCMCIA_VENDOR_INVALID and/or PCMCIA_PRODUCT_INVALID + * in front of this comment. + * + * There are cards which use a generic vendor and product id but needs + * a different handling depending on the cis_info, so ne2000_match + * needs a table where the exceptions comes first and then the normal + * product and vendor entries. + */ + + { PCMCIA_STR_IBM_INFOMOVER, + PCMCIA_VENDOR_IBM, PCMCIA_PRODUCT_IBM_INFOMOVER, + PCMCIA_CIS_IBM_INFOMOVER, + 0, 0x0ff0, { 0x08, 0x00, 0x5a } }, + + { PCMCIA_STR_LINKSYS_ECARD_1, + PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_ECARD_1, + PCMCIA_CIS_LINKSYS_ECARD_1, + 0, -1, { 0x00, 0x80, 0xc8 } }, + + { PCMCIA_STR_LINKSYS_COMBO_ECARD, + PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_COMBO_ECARD, + PCMCIA_CIS_LINKSYS_COMBO_ECARD, + 0, -1, { 0x00, 0x80, 0xc8 } }, + + { PCMCIA_STR_LINKSYS_TRUST_COMBO_ECARD, + PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_TRUST_COMBO_ECARD, + PCMCIA_CIS_LINKSYS_TRUST_COMBO_ECARD, + 0, 0x0120, { 0x20, 0x04, 0x49 } }, + + /* Although the comments above say to put VENDOR/PRODUCT INVALID IDs + above this list, we need to keep this one below the ECARD_1, or else + both will match the same more-generic entry rather than the more + specific one above with proper vendor and product IDs. */ + { PCMCIA_STR_LINKSYS_ECARD_2, + PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, + PCMCIA_CIS_LINKSYS_ECARD_2, + 0, -1, { 0x00, 0x80, 0xc8 } }, + + { PCMCIA_STR_IODATA_PCLAT, + PCMCIA_VENDOR_IODATA, PCMCIA_PRODUCT_IODATA_PCLAT, + PCMCIA_CIS_IODATA_PCLAT, + /* two possible location, 0x01c0 or 0x0ff0 */ + 0, -1, { 0x00, 0xa0, 0xb0 } }, + + { PCMCIA_STR_DAYNA_COMMUNICARD_E_1, + PCMCIA_VENDOR_DAYNA, PCMCIA_PRODUCT_DAYNA_COMMUNICARD_E_1, + PCMCIA_CIS_DAYNA_COMMUNICARD_E_1, + 0, 0x0110, { 0x00, 0x80, 0x19 } }, + + { PCMCIA_STR_DAYNA_COMMUNICARD_E_2, + PCMCIA_VENDOR_DAYNA, PCMCIA_PRODUCT_DAYNA_COMMUNICARD_E_2, + PCMCIA_CIS_DAYNA_COMMUNICARD_E_2, + 0, -1, { 0x00, 0x80, 0x19 } }, #if 0 /* the rest of these are stolen from the linux pcnet pcmcia device driver. Since I don't know the manfid or cis info strings for diff --git a/sys/dev/pcmcia/if_sm_pcmcia.c b/sys/dev/pcmcia/if_sm_pcmcia.c index d9ab4b20742..1d41c3ed73b 100644 --- a/sys/dev/pcmcia/if_sm_pcmcia.c +++ b/sys/dev/pcmcia/if_sm_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sm_pcmcia.c,v 1.2 1998/09/12 07:48:07 fgsch Exp $ */ +/* $OpenBSD: if_sm_pcmcia.c,v 1.3 1998/10/14 07:34:43 fgsch Exp $ */ /* $NetBSD: if_sm_pcmcia.c,v 1.11 1998/08/15 20:47:32 thorpej Exp $ */ /*- @@ -315,10 +315,10 @@ sm_pcmcia_lannid_ciscallback(tuple, arg) if (tuple->length < 2) return (0); - if ((pcmcia_tuple_read_1(tuple, 0) != - PCMCIA_TPLFE_TYPE_LAN_NID) || - (pcmcia_tuple_read_1(tuple, 1) != ETHER_ADDR_LEN)) - return (0); + if ((pcmcia_tuple_read_1(tuple, 0) != + PCMCIA_TPLFE_TYPE_LAN_NID) || + (pcmcia_tuple_read_1(tuple, 1) != ETHER_ADDR_LEN)) + return (0); for (i = 0; i < ETHER_ADDR_LEN; i++) myla[i] = pcmcia_tuple_read_1(tuple, i + 2); diff --git a/sys/dev/pcmcia/pcmciadevs b/sys/dev/pcmcia/pcmciadevs index 86904b2b890..ae86b670132 100644 --- a/sys/dev/pcmcia/pcmciadevs +++ b/sys/dev/pcmcia/pcmciadevs @@ -1,4 +1,4 @@ - $OpenBSD: pcmciadevs,v 1.3 1998/09/14 19:21:15 deraadt Exp $ + $OpenBSD: pcmciadevs,v 1.4 1998/10/14 07:34:43 fgsch Exp $ /* $NetBSD: pcmciadevs,v 1.13 1998/08/17 23:10:12 thorpej Exp $ */ /* @@ -36,6 +36,7 @@ * List of known PCMCIA vendors */ +vendor SANDISK 0x0045 Sandisk vendor NEWMEDIA 0x0057 NewMedia vendor IBM 0x00a4 IBM vendor 3COM 0x0101 3Com @@ -51,6 +52,7 @@ vendor LINKSYS 0x0149 Linksys vendor SIMPLETECH 0x014d Simple Technology vendor DAYNA 0x0194 Dayna vendor IODATA 0x01bf I-O DATA +vendor HAGIWARASYSCOM 0xc012 Hagiwara SYS-COM /* * List of known products. Grouped by vendor. @@ -65,7 +67,11 @@ product 3COM 3C589 0x0589 3Com 3c589 10Mbps Ethernet product 3COM 3C574 0x0574 3Com 3c574-TX 10/100Mbps Ethernet /* Dayna Products */ -product DAYNA COMMUNICARD_E 0x002d Dayna CommuniCard E +product DAYNA COMMUNICARD_E_1 0x002d Dayna CommuniCard E +product DAYNA COMMUNICARD_E_2 0x002f Dayna CommuniCard E + +/* DIGITAL Products */ +product DIGITAL MOBILE_MEDIA_CDROM 0x0d00 Digital Mobile Media CD-ROM /* Motorola Products */ product MOTOROLA POWER144 0x0105 Motorola Power 14.4 Modem @@ -80,24 +86,28 @@ product IBM HOME_AND_AWAY 0x002e IBM Home and Away Modem product IODATA PCLAT 0x2216 I-O DATA PCLA/T /* Linksys corporation */ -product LINKSYS ECARD 0x0265 Linksys EthernetCard +product LINKSYS ECARD_1 0x0265 Linksys EthernetCard product LINKSYS COMBO_ECARD 0xc1ab Linksys Combo EthernetCard product LINKSYS TRUST_COMBO_ECARD 0x021b Trust (Linksys) Combo EthernetCard /* Megahertz Products */ product MEGAHERTZ XJ4288 0x0023 Megahertz XJ4288 Modem +product MEGAHERTZ XJ5560 0x0034 Megahertz X-JACK 56kbps Modem product MEGAHERTZ2 XJEM1144 0x0101 Megahertz XJEM1144 Ethernet product MEGAHERTZ2 XJACK 0x0103 Megahertz X-JACK Ethernet /* US Robotics Products */ product USROBOTICS WORLDPORT144 0x3330 US Robotics WorldPort 14.4 Modem +/* Sandisk Products */ +product SANDISK SDCFB 0x0401 Sandisk CompactFlash Card + /* Simple Technology Products */ product SIMPLETECH COMMUNICATOR288 0x0100 Simple Technology 28.8 Communicator /* Socket Communications Products */ product SOCKET PAGECARD 0x0003 Socket Communications PageCard -product SOCKET DUAL_RS232 0x0012 Socket Communications Dual RS232 +product SOCKET DUAL_RS232 0x0006 Socket Communications Dual RS232 /* TDK Products */ product TDK LAK_CD021BX 0x0200 TDK LAK-CD021BX Ethernet @@ -117,6 +127,7 @@ vendor RPTI -1 RPTI vendor ACCTON -1 ACCTON vendor YEDATA -1 Y-E DATA vendor DIGITAL -1 Digital +vendor TEAC -1 TEAC product MEGAHERTZ XJ2288 { "MEGAHERTZ", "MODEM&spXJ2288", NULL, NULL } Megahertz XJ2288 Modem product PREMAX PE200 { "PMX&sp&sp&sp", "PE-200", NULL, NULL } PreMax PE-200 @@ -127,3 +138,5 @@ product RPTI EP401 { "RPTI", "EP401&spEthernet&spNE2000&spCompatible", NULL, NU product ACCTON EN2212 { "ACCTON", "EN2212", NULL, NULL } Accton EN2212 product YEDATA EXTERNAL_FDD { "Y-E&spDATA", "External&spFDD", NULL, NULL } Y-E DATA External FDD product DIGITAL DEPCMXX { "DIGITAL", "DEPCM-XX", NULL, NULL } DEC DEPCM-BA +product TEAC IDECARDII { NULL, "NinjaATA-", NULL, NULL } TEAC IDE Card/II +product LINKSYS ECARD_2 { "LINKSYS", "E-CARD", NULL, NULL } Linksys E-Card diff --git a/sys/dev/pcmcia/pcmciadevs.h b/sys/dev/pcmcia/pcmciadevs.h index 374b99aacc4..fe894c36ef6 100644 --- a/sys/dev/pcmcia/pcmciadevs.h +++ b/sys/dev/pcmcia/pcmciadevs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pcmciadevs.h,v 1.4 1998/09/24 11:40:33 deraadt Exp $ */ +/* $OpenBSD: pcmciadevs.h,v 1.5 1998/10/14 07:34:43 fgsch Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. @@ -43,6 +43,7 @@ * List of known PCMCIA vendors */ +#define PCMCIA_VENDOR_SANDISK 0x0045 /* Sandisk */ #define PCMCIA_VENDOR_NEWMEDIA 0x0057 /* NewMedia */ #define PCMCIA_VENDOR_IBM 0x00a4 /* IBM */ #define PCMCIA_VENDOR_3COM 0x0101 /* 3Com */ @@ -58,6 +59,7 @@ #define PCMCIA_VENDOR_SIMPLETECH 0x014d /* Simple Technology */ #define PCMCIA_VENDOR_DAYNA 0x0194 /* Dayna */ #define PCMCIA_VENDOR_IODATA 0x01bf /* I-O DATA */ +#define PCMCIA_VENDOR_HAGIWARASYSCOM 0xc012 /* Hagiwara SYS-COM */ /* * List of known products. Grouped by vendor. @@ -82,9 +84,17 @@ #define PCMCIA_STR_3COM_3C574 "3Com 3c574-TX 10/100Mbps Ethernet" /* Dayna Products */ -#define PCMCIA_CIS_DAYNA_COMMUNICARD_E { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_DAYNA_COMMUNICARD_E 0x002d -#define PCMCIA_STR_DAYNA_COMMUNICARD_E "Dayna CommuniCard E" +#define PCMCIA_CIS_DAYNA_COMMUNICARD_E_1 { NULL, NULL, NULL, NULL } +#define PCMCIA_PRODUCT_DAYNA_COMMUNICARD_E_1 0x002d +#define PCMCIA_STR_DAYNA_COMMUNICARD_E_1 "Dayna CommuniCard E" +#define PCMCIA_CIS_DAYNA_COMMUNICARD_E_2 { NULL, NULL, NULL, NULL } +#define PCMCIA_PRODUCT_DAYNA_COMMUNICARD_E_2 0x002f +#define PCMCIA_STR_DAYNA_COMMUNICARD_E_2 "Dayna CommuniCard E" + +/* DIGITAL Products */ +#define PCMCIA_CIS_DIGITAL_MOBILE_MEDIA_CDROM { NULL, NULL, NULL, NULL } +#define PCMCIA_PRODUCT_DIGITAL_MOBILE_MEDIA_CDROM 0x0d00 +#define PCMCIA_STR_DIGITAL_MOBILE_MEDIA_CDROM "Digital Mobile Media CD-ROM" /* Motorola Products */ #define PCMCIA_CIS_MOTOROLA_POWER144 { NULL, NULL, NULL, NULL } @@ -111,9 +121,9 @@ #define PCMCIA_STR_IODATA_PCLAT "I-O DATA PCLA/T" /* Linksys corporation */ -#define PCMCIA_CIS_LINKSYS_ECARD { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_LINKSYS_ECARD 0x0265 -#define PCMCIA_STR_LINKSYS_ECARD "Linksys EthernetCard" +#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" #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" @@ -125,6 +135,9 @@ #define PCMCIA_CIS_MEGAHERTZ_XJ4288 { NULL, NULL, NULL, NULL } #define PCMCIA_PRODUCT_MEGAHERTZ_XJ4288 0x0023 #define PCMCIA_STR_MEGAHERTZ_XJ4288 "Megahertz XJ4288 Modem" +#define PCMCIA_CIS_MEGAHERTZ_XJ5560 { NULL, NULL, NULL, NULL } +#define PCMCIA_PRODUCT_MEGAHERTZ_XJ5560 0x0034 +#define PCMCIA_STR_MEGAHERTZ_XJ5560 "Megahertz X-JACK 56kbps Modem" #define PCMCIA_CIS_MEGAHERTZ2_XJEM1144 { NULL, NULL, NULL, NULL } #define PCMCIA_PRODUCT_MEGAHERTZ2_XJEM1144 0x0101 #define PCMCIA_STR_MEGAHERTZ2_XJEM1144 "Megahertz XJEM1144 Ethernet" @@ -137,6 +150,11 @@ #define PCMCIA_PRODUCT_USROBOTICS_WORLDPORT144 0x3330 #define PCMCIA_STR_USROBOTICS_WORLDPORT144 "US Robotics WorldPort 14.4 Modem" +/* Sandisk Products */ +#define PCMCIA_CIS_SANDISK_SDCFB { NULL, NULL, NULL, NULL } +#define PCMCIA_PRODUCT_SANDISK_SDCFB 0x0401 +#define PCMCIA_STR_SANDISK_SDCFB "Sandisk CompactFlash Card" + /* Simple Technology Products */ #define PCMCIA_CIS_SIMPLETECH_COMMUNICATOR288 { NULL, NULL, NULL, NULL } #define PCMCIA_PRODUCT_SIMPLETECH_COMMUNICATOR288 0x0100 @@ -147,7 +165,7 @@ #define PCMCIA_PRODUCT_SOCKET_PAGECARD 0x0003 #define PCMCIA_STR_SOCKET_PAGECARD "Socket Communications PageCard" #define PCMCIA_CIS_SOCKET_DUAL_RS232 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_SOCKET_DUAL_RS232 0x0012 +#define PCMCIA_PRODUCT_SOCKET_DUAL_RS232 0x0006 #define PCMCIA_STR_SOCKET_DUAL_RS232 "Socket Communications Dual RS232" /* TDK Products */ @@ -176,6 +194,7 @@ #define PCMCIA_VENDOR_ACCTON -1 /* ACCTON */ #define PCMCIA_VENDOR_YEDATA -1 /* Y-E DATA */ #define PCMCIA_VENDOR_DIGITAL -1 /* Digital */ +#define PCMCIA_VENDOR_TEAC -1 /* TEAC */ #define PCMCIA_CIS_MEGAHERTZ_XJ2288 { "MEGAHERTZ", "MODEM XJ2288", NULL, NULL } #define PCMCIA_PRODUCT_MEGAHERTZ_XJ2288 -1 @@ -204,3 +223,9 @@ #define PCMCIA_CIS_DIGITAL_DEPCMXX { "DIGITAL", "DEPCM-XX", NULL, NULL } #define PCMCIA_PRODUCT_DIGITAL_DEPCMXX -1 #define PCMCIA_STR_DIGITAL_DEPCMXX "DEC DEPCM-BA" +#define PCMCIA_CIS_TEAC_IDECARDII { NULL, "NinjaATA-", NULL, NULL } +#define PCMCIA_PRODUCT_TEAC_IDECARDII -1 +#define PCMCIA_STR_TEAC_IDECARDII "TEAC IDE Card/II" +#define PCMCIA_CIS_LINKSYS_ECARD_2 { "LINKSYS", "E-CARD", NULL, NULL } +#define PCMCIA_PRODUCT_LINKSYS_ECARD_2 -1 +#define PCMCIA_STR_LINKSYS_ECARD_2 "Linksys E-Card" diff --git a/sys/dev/pcmcia/pcmciadevs_data.h b/sys/dev/pcmcia/pcmciadevs_data.h index c27ed34bb93..33ecf458804 100644 --- a/sys/dev/pcmcia/pcmciadevs_data.h +++ b/sys/dev/pcmcia/pcmciadevs_data.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pcmciadevs_data.h,v 1.4 1998/09/24 11:40:33 deraadt Exp $ */ +/* $OpenBSD: pcmciadevs_data.h,v 1.5 1998/10/14 07:34:43 fgsch Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. @@ -76,13 +76,27 @@ struct pcmcia_knowndev pcmcia_knowndevs[] = { "3Com 3c574-TX 10/100Mbps Ethernet" }, }, { - PCMCIA_VENDOR_DAYNA, PCMCIA_PRODUCT_DAYNA_COMMUNICARD_E, - PCMCIA_CIS_DAYNA_COMMUNICARD_E, + PCMCIA_VENDOR_DAYNA, PCMCIA_PRODUCT_DAYNA_COMMUNICARD_E_1, + PCMCIA_CIS_DAYNA_COMMUNICARD_E_1, 0, "Dayna", "Dayna CommuniCard E" }, }, { + PCMCIA_VENDOR_DAYNA, PCMCIA_PRODUCT_DAYNA_COMMUNICARD_E_2, + PCMCIA_CIS_DAYNA_COMMUNICARD_E_2, + 0, + "Dayna", + "Dayna CommuniCard E" }, + }, + { + PCMCIA_VENDOR_DIGITAL, PCMCIA_PRODUCT_DIGITAL_MOBILE_MEDIA_CDROM, + PCMCIA_CIS_DIGITAL_MOBILE_MEDIA_CDROM, + 0, + "Digital", + "Digital Mobile Media CD-ROM" }, + }, + { PCMCIA_VENDOR_MOTOROLA, PCMCIA_PRODUCT_MOTOROLA_POWER144, PCMCIA_CIS_MOTOROLA_POWER144, 0, @@ -125,8 +139,8 @@ struct pcmcia_knowndev pcmcia_knowndevs[] = { "I-O DATA PCLA/T" }, }, { - PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_ECARD, - PCMCIA_CIS_LINKSYS_ECARD, + PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_ECARD_1, + PCMCIA_CIS_LINKSYS_ECARD_1, 0, "Linksys", "Linksys EthernetCard" }, @@ -153,6 +167,13 @@ struct pcmcia_knowndev pcmcia_knowndevs[] = { "Megahertz XJ4288 Modem" }, }, { + PCMCIA_VENDOR_MEGAHERTZ, PCMCIA_PRODUCT_MEGAHERTZ_XJ5560, + PCMCIA_CIS_MEGAHERTZ_XJ5560, + 0, + "Megahertz", + "Megahertz X-JACK 56kbps Modem" }, + }, + { PCMCIA_VENDOR_MEGAHERTZ2, PCMCIA_PRODUCT_MEGAHERTZ2_XJEM1144, PCMCIA_CIS_MEGAHERTZ2_XJEM1144, 0, @@ -174,6 +195,13 @@ struct pcmcia_knowndev pcmcia_knowndevs[] = { "US Robotics WorldPort 14.4 Modem" }, }, { + PCMCIA_VENDOR_SANDISK, PCMCIA_PRODUCT_SANDISK_SDCFB, + PCMCIA_CIS_SANDISK_SDCFB, + 0, + "Sandisk", + "Sandisk CompactFlash Card" }, + }, + { PCMCIA_VENDOR_SIMPLETECH, PCMCIA_PRODUCT_SIMPLETECH_COMMUNICATOR288, PCMCIA_CIS_SIMPLETECH_COMMUNICATOR288, 0, @@ -286,6 +314,27 @@ struct pcmcia_knowndev pcmcia_knowndevs[] = { "DEC DEPCM-BA" }, }, { + PCMCIA_VENDOR_UNKNOWN, PCMCIA_PRODUCT_TEAC_IDECARDII, + PCMCIA_CIS_TEAC_IDECARDII, + 0, + "TEAC", + "TEAC IDE Card/II" }, + }, + { + PCMCIA_VENDOR_UNKNOWN, PCMCIA_PRODUCT_LINKSYS_ECARD_2, + PCMCIA_CIS_LINKSYS_ECARD_2, + 0, + "Linksys", + "Linksys E-Card" }, + }, + { + PCMCIA_VENDOR_SANDISK, 0, + PCMCIA_KNOWNDEV_NOPROD, + PCMCIA_CIS_INVALID, + "Sandisk", + NULL, + }, + { PCMCIA_VENDOR_NEWMEDIA, 0, PCMCIA_KNOWNDEV_NOPROD, PCMCIA_CIS_INVALID, @@ -391,6 +440,13 @@ struct pcmcia_knowndev pcmcia_knowndevs[] = { NULL, }, { + PCMCIA_VENDOR_HAGIWARASYSCOM, 0, + PCMCIA_KNOWNDEV_NOPROD, + PCMCIA_CIS_INVALID, + "Hagiwara SYS-COM", + NULL, + }, + { PCMCIA_VENDOR_PREMAX, 0, PCMCIA_KNOWNDEV_NOPROD, PCMCIA_CIS_INVALID, @@ -439,5 +495,12 @@ struct pcmcia_knowndev pcmcia_knowndevs[] = { "Digital", NULL, }, + { + PCMCIA_VENDOR_TEAC, 0, + PCMCIA_KNOWNDEV_NOPROD, + PCMCIA_CIS_INVALID, + "TEAC", + NULL, + }, { 0, 0, { NULL, NULL, NULL, NULL }, 0, NULL, NULL, } }; |