From 578ecafc39971490db66343db099a3e080611101 Mon Sep 17 00:00:00 2001 From: imp Date: Thu, 24 Aug 2000 07:01:49 +0000 Subject: Sync to pccarddevs 1.5 --- sys/dev/pccard/pccarddevs.h | 155 ++++++++++++++++--------- sys/dev/pccard/pccarddevs_data.h | 238 ++++++++++++++++++++++++++++++--------- 2 files changed, 286 insertions(+), 107 deletions(-) (limited to 'sys/dev/pccard') diff --git a/sys/dev/pccard/pccarddevs.h b/sys/dev/pccard/pccarddevs.h index 6787f4a..89592ad 100644 --- a/sys/dev/pccard/pccarddevs.h +++ b/sys/dev/pccard/pccarddevs.h @@ -4,9 +4,9 @@ * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.4 2000/03/25 04:04:24 imp Exp + * FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.5 2000/08/24 07:01:12 imp Exp */ -/* $NetBSD: pcmciadevs,v 1.85 2000/03/22 21:39:57 mycroft Exp $ +/* $NetBSD: pcmciadevs,v 1.97 2000/07/26 07:24:15 onoe Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -51,8 +51,8 @@ #define PCCARD_VENDOR_FUJITSU 0x0004 /* Fujitsu Corporation */ #define PCCARD_VENDOR_PANASONIC 0x0032 /* Matsushita Electric Industrial Co. */ #define PCCARD_VENDOR_SANDISK 0x0045 /* Sandisk Corporation */ -#define PCCARD_VENDOR_NEWMEDIA 0x0057 /* NewMedia Corporation */ -#define PCCARD_VENDOR_INTEL 0x0089 /* Intel Corporation */ +#define PCCARD_VENDOR_NEWMEDIA 0x0057 /* New Media Corporation */ +#define PCCARD_VENDOR_INTEL 0x0089 /* Intel */ #define PCCARD_VENDOR_IBM 0x00a4 /* IBM Corporation */ #define PCCARD_VENDOR_MOTOROLA 0x0109 /* Motorola Corporation */ #define PCCARD_VENDOR_3COM 0x0101 /* 3Com Corporation */ @@ -63,6 +63,7 @@ #define PCCARD_VENDOR_SMC 0x0108 /* Standard Microsystems Corporation */ #define PCCARD_VENDOR_USROBOTICS 0x0115 /* US Robotics Corporation */ #define PCCARD_VENDOR_MEGAHERTZ2 0x0128 /* Megahertz Corporation */ +#define PCCARD_VENDOR_OLICOM 0x0121 /* Olicom */ #define PCCARD_VENDOR_ADAPTEC 0x012f /* Adaptec Corporation */ #define PCCARD_VENDOR_COMPAQ 0x0138 /* Compaq */ #define PCCARD_VENDOR_LINKSYS 0x0149 /* Linksys Corporation */ @@ -74,7 +75,9 @@ #define PCCARD_VENDOR_RAYTHEON 0x01a6 /* Raytheon */ #define PCCARD_VENDOR_IODATA 0x01bf /* I-O DATA */ #define PCCARD_VENDOR_BAY 0x01eb /* Bay Networks */ +#define PCCARD_VENDOR_FARALLON 0x0200 /* Farallon Communications */ #define PCCARD_VENDOR_NOKIA 0x023d /* Nokia Communications */ +#define PCCARD_VENDOR_SAMSUNG 0x0250 /* Samsung */ #define PCCARD_VENDOR_LASAT 0x3401 /* Lasat Communications A/S */ #define PCCARD_VENDOR_LEXARMEDIA 0x4e01 /* Lexar Media */ #define PCCARD_VENDOR_COMPEX 0x8a01 /* Compex Corporation */ @@ -90,14 +93,17 @@ */ /* Adaptec Products */ -#define PCCARD_CIS_ADAPTEC_APA1460_1 { NULL, NULL, NULL, NULL } -#define PCCARD_PRODUCT_ADAPTEC_APA1460_1 0x0001 -#define PCCARD_STR_ADAPTEC_APA1460_1 "Adaptec APA-1460/A SCSI Host Adapter" -#define PCCARD_CIS_ADAPTEC_APA1460_2 { NULL, NULL, NULL, NULL } -#define PCCARD_PRODUCT_ADAPTEC_APA1460_2 0x0002 -#define PCCARD_STR_ADAPTEC_APA1460_2 "Adaptec APA-1460/B SCSI Host Adapter" +#define PCCARD_CIS_ADAPTEC_APA1460 { NULL, NULL, NULL, NULL } +#define PCCARD_PRODUCT_ADAPTEC_APA1460 0x0001 +#define PCCARD_STR_ADAPTEC_APA1460 "Adaptec APA-1460 SlimSCSI" +#define PCCARD_CIS_ADAPTEC_APA1460A { NULL, NULL, NULL, NULL } +#define PCCARD_PRODUCT_ADAPTEC_APA1460A 0x0002 +#define PCCARD_STR_ADAPTEC_APA1460A "Adaptec APA-1460A SlimSCSI" /* 3COM Products */ +#define PCCARD_CIS_3COM_3CRWE737A { NULL, NULL, NULL, NULL } +#define PCCARD_PRODUCT_3COM_3CRWE737A 0x0001 +#define PCCARD_STR_3COM_3CRWE737A "3Com AirConnect Wireless LAN" #define PCCARD_CIS_3COM_3C1 { NULL, NULL, NULL, NULL } #define PCCARD_PRODUCT_3COM_3C1 0x0cf1 #define PCCARD_STR_3COM_3C1 "3Com Megahertz 3C1 10Mbps LAN CF+ Card" @@ -123,6 +129,11 @@ #define PCCARD_PRODUCT_3COM_3CCFEM556BI 0x0556 #define PCCARD_STR_3COM_3CCFEM556BI "3Com/Megahertz 3CCFEM556BI Ethernet/Modem" +/* Compaq Products */ +#define PCCARD_CIS_COMPAQ2_CPQ_10_100 { NULL, NULL, NULL, NULL } +#define PCCARD_PRODUCT_COMPAQ2_CPQ_10_100 0x010a +#define PCCARD_STR_COMPAQ2_CPQ_10_100 "Compaq Netelligent 10/100 Ethernet" + /* Compex Products */ #define PCCARD_CIS_COMPEX_LINKPORT_ENET_B { NULL, NULL, NULL, NULL } #define PCCARD_PRODUCT_COMPEX_LINKPORT_ENET_B 0x0100 @@ -170,34 +181,44 @@ /* IBM Products */ #define PCCARD_CIS_IBM_3270 { NULL, NULL, NULL, NULL } #define PCCARD_PRODUCT_IBM_3270 0x0001 -#define PCCARD_STR_IBM_3270 "3270 Emulation" +#define PCCARD_STR_IBM_3270 "IBM 3270 Emulation" #define PCCARD_CIS_IBM_INFOMOVER { NULL, NULL, NULL, NULL } #define PCCARD_PRODUCT_IBM_INFOMOVER 0x0002 -#define PCCARD_STR_IBM_INFOMOVER "National Semiconductor InfoMover" +#define PCCARD_STR_IBM_INFOMOVER "IBM InfoMover" #define PCCARD_CIS_IBM_5250 { NULL, NULL, NULL, NULL } #define PCCARD_PRODUCT_IBM_5250 0x000b -#define PCCARD_STR_IBM_5250 "5250 Emulation" +#define PCCARD_STR_IBM_5250 "IBM 5250 Emulation" #define PCCARD_CIS_IBM_TROPIC { NULL, NULL, NULL, NULL } #define PCCARD_PRODUCT_IBM_TROPIC 0x001e -#define PCCARD_STR_IBM_TROPIC "Token Ring 4/16" +#define PCCARD_STR_IBM_TROPIC "IBM Token Ring 4/16" +#define PCCARD_CIS_IBM_PORTABLE_CDROM { NULL, NULL, NULL, NULL } +#define PCCARD_PRODUCT_IBM_PORTABLE_CDROM 0x002d +#define PCCARD_STR_IBM_PORTABLE_CDROM "IBM PCMCIA Portable CD-ROM Drive" #define PCCARD_CIS_IBM_HOME_AND_AWAY { NULL, NULL, NULL, NULL } #define PCCARD_PRODUCT_IBM_HOME_AND_AWAY 0x002e #define PCCARD_STR_IBM_HOME_AND_AWAY "IBM Home and Away Modem" #define PCCARD_CIS_IBM_WIRELESS_LAN_ENTRY { NULL, NULL, NULL, NULL } #define PCCARD_PRODUCT_IBM_WIRELESS_LAN_ENTRY 0x0032 -#define PCCARD_STR_IBM_WIRELESS_LAN_ENTRY "Wireless LAN Entry" -#define PCCARD_CIS_IBM_PORTABLE_CDROM { NULL, NULL, NULL, NULL } -#define PCCARD_PRODUCT_IBM_PORTABLE_CDROM 0x002d -#define PCCARD_STR_IBM_PORTABLE_CDROM "PCMCIA Portable CD-ROM Drive" +#define PCCARD_STR_IBM_WIRELESS_LAN_ENTRY "IBM Wireless LAN Entry" #define PCCARD_CIS_IBM_ETHERJET { NULL, NULL, NULL, NULL } #define PCCARD_PRODUCT_IBM_ETHERJET 0x003f #define PCCARD_STR_IBM_ETHERJET "IBM EtherJet Ethernet" +/* Intel Products */ +#define PCCARD_CIS_INTEL_EEPRO100 { NULL, NULL, NULL, NULL } +#define PCCARD_PRODUCT_INTEL_EEPRO100 0x010a +#define PCCARD_STR_INTEL_EEPRO100 "Intel EtherExpress PRO/100" + /* I-O DATA */ #define PCCARD_CIS_IODATA_PCLATE { NULL, NULL, NULL, NULL } #define PCCARD_PRODUCT_IODATA_PCLATE 0x2216 #define PCCARD_STR_IODATA_PCLATE "I-O DATA PCLA/TE" +/* Farallon */ +#define PCCARD_CIS_FARALLON_SKYLINE { NULL, NULL, NULL, NULL } +#define PCCARD_PRODUCT_FARALLON_SKYLINE 0x0a01 +#define PCCARD_STR_FARALLON_SKYLINE "SkyLINE Wireless" + /* Lexar Media */ #define PCCARD_CIS_LEXARMEDIA_COMPATFLASH { NULL, NULL, NULL, NULL } #define PCCARD_PRODUCT_LEXARMEDIA_COMPATFLASH 0x0100 @@ -244,10 +265,18 @@ #define PCCARD_PRODUCT_NOKIA_C020_WLAN 0x20c0 #define PCCARD_STR_NOKIA_C020_WLAN "Nokia C020 WLAN Card" +/* Olicom Products */ +#define PCCARD_CIS_OLICOM_TR { NULL, NULL, NULL, NULL } +#define PCCARD_PRODUCT_OLICOM_TR 0x2132 +#define PCCARD_STR_OLICOM_TR "GoCard Token Ring 16/4" + /* Panasonic Products */ #define PCCARD_CIS_PANASONIC_KXLC002 { NULL, NULL, NULL, NULL } #define PCCARD_PRODUCT_PANASONIC_KXLC002 0x0304 #define PCCARD_STR_PANASONIC_KXLC002 "Panasonic 4X CD-ROM Interface Card" +#define PCCARD_CIS_PANASONIC_KXLC003 { NULL, NULL, NULL, NULL } +#define PCCARD_PRODUCT_PANASONIC_KXLC003 0x0504 +#define PCCARD_STR_PANASONIC_KXLC003 "Panasonic 8X CD-ROM Interface Card" /* US Robotics Products */ #define PCCARD_CIS_USROBOTICS_WORLDPORT144 { NULL, NULL, NULL, NULL } @@ -290,31 +319,37 @@ #define PCCARD_PRODUCT_TDK_LAK_CF010 0x0900 #define PCCARD_STR_TDK_LAK_CF010 "TDK LAC-CF010" -/* TDK Vendor ID also used by Xircom! */ -#define PCCARD_CIS_TDK_XIR_CE_10 { NULL, NULL, NULL, NULL } -#define PCCARD_PRODUCT_TDK_XIR_CE_10 0x0108 -#define PCCARD_STR_TDK_XIR_CE_10 "Xircom CreditCard Ethernet" -#define PCCARD_CIS_TDK_XIR_CEM_10 { NULL, NULL, NULL, NULL } -#define PCCARD_PRODUCT_TDK_XIR_CEM_10 0x110a -#define PCCARD_STR_TDK_XIR_CEM_10 "Xircom CreditCard Ethernet + Modem" -#define PCCARD_CIS_TDK_XIR_CEM_28 { NULL, NULL, NULL, NULL } -#define PCCARD_PRODUCT_TDK_XIR_CEM_28 0x110b -#define PCCARD_STR_TDK_XIR_CEM_28 "Xircom CreditCard Ethernet + Modem 28.8" -#define PCCARD_CIS_TDK_XIR_PS_CE2_10 { NULL, NULL, NULL, NULL } -#define PCCARD_PRODUCT_TDK_XIR_PS_CE2_10 0x010b -#define PCCARD_STR_TDK_XIR_PS_CE2_10 "Xircom CreditCard CE2 Ethernet" -#define PCCARD_CIS_TDK_XIR_CE3_10_100 { NULL, NULL, NULL, NULL } -#define PCCARD_PRODUCT_TDK_XIR_CE3_10_100 0x010a -#define PCCARD_STR_TDK_XIR_CE3_10_100 "Xircom CreditCard CE3 10/100 Ethernet" -/* conflicts with above - * product TDK XIR_CFE_10 0x010a Xircom CompactCard CFE-10 - */ -#define PCCARD_CIS_TDK_XIR_CNW_801 { NULL, NULL, NULL, NULL } -#define PCCARD_PRODUCT_TDK_XIR_CNW_801 0x0801 -#define PCCARD_STR_TDK_XIR_CNW_801 "Xircom CreditCard Netwave (Canada)" -#define PCCARD_CIS_TDK_XIR_CNW_802 { NULL, NULL, NULL, NULL } -#define PCCARD_PRODUCT_TDK_XIR_CNW_802 0x0802 -#define PCCARD_STR_TDK_XIR_CNW_802 "Xircom CreditCard Netwave (US)" +/* Xircom Products */ +#define PCCARD_CIS_XIRCOM_CE { NULL, NULL, NULL, NULL } +#define PCCARD_PRODUCT_XIRCOM_CE 0x0108 +#define PCCARD_STR_XIRCOM_CE "Xircom CreditCard Ethernet" +#define PCCARD_CIS_XIRCOM_CE2 { NULL, NULL, NULL, NULL } +#define PCCARD_PRODUCT_XIRCOM_CE2 0x010b +#define PCCARD_STR_XIRCOM_CE2 "Xircom CreditCard Ethernet II" +#define PCCARD_CIS_XIRCOM_CE3 { NULL, NULL, NULL, NULL } +#define PCCARD_PRODUCT_XIRCOM_CE3 0x010a +#define PCCARD_STR_XIRCOM_CE3 "Xircom CreditCard 10/100 Ethernet" +#define PCCARD_CIS_XIRCOM_CEM { NULL, NULL, NULL, NULL } +#define PCCARD_PRODUCT_XIRCOM_CEM 0x110a +#define PCCARD_STR_XIRCOM_CEM "Xircom CreditCard Ethernet + Modem" +#define PCCARD_CIS_XIRCOM_CEM28 { NULL, NULL, NULL, NULL } +#define PCCARD_PRODUCT_XIRCOM_CEM28 0x110b +#define PCCARD_STR_XIRCOM_CEM28 "Xircom CreditCard Ethernet + Modem 28" +#define PCCARD_CIS_XIRCOM_CEM33 { NULL, NULL, NULL, NULL } +#define PCCARD_PRODUCT_XIRCOM_CEM33 0x110b +#define PCCARD_STR_XIRCOM_CEM33 "Xircom CreditCard Ethernet + Modem 33" +#define PCCARD_CIS_XIRCOM_CEM56 { NULL, NULL, NULL, NULL } +#define PCCARD_PRODUCT_XIRCOM_CEM56 0x110b +#define PCCARD_STR_XIRCOM_CEM56 "Xircom CreditCard Ethernet + Modem 56" +#define PCCARD_CIS_XIRCOM_REM56 { NULL, NULL, NULL, NULL } +#define PCCARD_PRODUCT_XIRCOM_REM56 0x110a +#define PCCARD_STR_XIRCOM_REM56 "Xircom RealPort Ethernet 10/100 + Modem 56" +#define PCCARD_CIS_XIRCOM_CNW_801 { NULL, NULL, NULL, NULL } +#define PCCARD_PRODUCT_XIRCOM_CNW_801 0x0801 +#define PCCARD_STR_XIRCOM_CNW_801 "Xircom CreditCard Netwave (Canada)" +#define PCCARD_CIS_XIRCOM_CNW_802 { NULL, NULL, NULL, NULL } +#define PCCARD_PRODUCT_XIRCOM_CNW_802 0x0802 +#define PCCARD_STR_XIRCOM_CNW_802 "Xircom CreditCard Netwave (US)" /* New Media Products */ #define PCCARD_CIS_NEWMEDIA_BASICS { NULL, NULL, NULL, NULL } @@ -376,6 +411,16 @@ #define PCCARD_PRODUCT_RAYTHEON_WLAN 0x0000 #define PCCARD_STR_RAYTHEON_WLAN "WLAN Adapter" +/* RATOC System Inc. Products */ +#define PCCARD_CIS_RATOC_REX_R280 { NULL, NULL, NULL, NULL } +#define PCCARD_PRODUCT_RATOC_REX_R280 0x1 +#define PCCARD_STR_RATOC_REX_R280 "RATOC REX-R280" + +/* Samsung */ +#define PCCARD_CIS_SAMSUNG_SWL_2000N { NULL, NULL, NULL, NULL } +#define PCCARD_PRODUCT_SAMSUNG_SWL_2000N 0x02 +#define PCCARD_STR_SAMSUNG_SWL_2000N "Samsung MagicLAN SWL-2000N" + /* Cards we know only by their cis */ #define PCCARD_VENDOR_PREMAX -1 /* Premax */ #define PCCARD_VENDOR_PLANET -1 /* Planet */ @@ -394,6 +439,7 @@ #define PCCARD_VENDOR_ICOM -1 /* ICOM Inc */ #define PCCARD_VENDOR_BILLIONTON -1 /* Billionton Systems Inc. */ #define PCCARD_VENDOR_AMD -1 /* AMD */ +#define PCCARD_VENDOR_INTERSIL -1 /* Intersil */ #define PCCARD_CIS_MEGAHERTZ_XJ2288 { "MEGAHERTZ", "MODEM XJ2288", NULL, NULL } #define PCCARD_PRODUCT_MEGAHERTZ_XJ2288 -1 @@ -450,6 +496,9 @@ #define PCCARD_CIS_COREGA_FAST_ETHER_PCC_TX { "corega K.K.", "corega FastEther PCC-TX", NULL, NULL } #define PCCARD_PRODUCT_COREGA_FAST_ETHER_PCC_TX -1 #define PCCARD_STR_COREGA_FAST_ETHER_PCC_TX "Corega FastEther PCC-TX" +#define PCCARD_CIS_COREGA_WIRELESS_LAN_PCC_11 { "corega K.K.", "Wireless LAN PCC-11", NULL, NULL } +#define PCCARD_PRODUCT_COREGA_WIRELESS_LAN_PCC_11 -1 +#define PCCARD_STR_COREGA_WIRELESS_LAN_PCC_11 "Corega Wireless LAN PCC-11" #define PCCARD_CIS_SVEC_COMBOCARD { "Ethernet", "Adapter", NULL, NULL } #define PCCARD_PRODUCT_SVEC_COMBOCARD -1 #define PCCARD_STR_SVEC_COMBOCARD "SVEC/Hawking Tech. Combo Card" @@ -463,10 +512,15 @@ #define PCCARD_CIS_SVEC_PN650TX { NULL, NULL, NULL, NULL } #define PCCARD_PRODUCT_SVEC_PN650TX -1 #define PCCARD_STR_SVEC_PN650TX "SVEC PN650TX 10/100 Dual Speed Fast Ethernet PC Card" - #define PCCARD_CIS_NAKAGAWAMETAL_LNT10TN { "PCMCIA", "LNT-10TN", NULL, NULL } #define PCCARD_PRODUCT_NAKAGAWAMETAL_LNT10TN -1 #define PCCARD_STR_NAKAGAWAMETAL_LNT10TN "NAKAGAWA METAL LNT-10TN NE2000 Compatible Card" +#define PCCARD_CIS_AMBICOM_AMB8002T { "AmbiCom Inc", "AMB8002T", NULL, NULL } +#define PCCARD_PRODUCT_AMBICOM_AMB8002T -1 +#define PCCARD_STR_AMBICOM_AMB8002T "AmbiCom AMB8002T" +#define PCCARD_CIS_IODATA_PCLAT { "I-O DATA", "PCLA", "ETHERNET", NULL } +#define PCCARD_PRODUCT_IODATA_PCLAT -1 +#define PCCARD_STR_IODATA_PCLAT "IO-DATA PCLA/T" #define PCCARD_CIS_EPSON_EEN10B { "Seiko Epson Corp.", "Ethernet", "P/N: EEN10B Rev. 00", NULL } #define PCCARD_PRODUCT_EPSON_EEN10B -1 #define PCCARD_STR_EPSON_EEN10B "Epson EEN10B" @@ -485,10 +539,9 @@ #define PCCARD_CIS_BILLIONTON_LNT10TN { "PCMCIA", "LNT-10TN", NULL, NULL } #define PCCARD_PRODUCT_BILLIONTON_LNT10TN -1 #define PCCARD_STR_BILLIONTON_LNT10TN "Billionton Systems Inc. LNT-10TN NE2000 Compatible Card" - -#define PCCARD_CIS_AMBICOM_AMB8002T { "AmbiCom Inc", "AMB8002T", NULL, NULL } -#define PCCARD_PRODUCT_AMBICOM_AMB8002T -1 -#define PCCARD_STR_AMBICOM_AMB8002T "AmbiCom AMB8002T" -#define PCCARD_CIS_IODATA_PCLAT { "I-O DATA", "PCLA", "ETHERNET", NULL } -#define PCCARD_PRODUCT_IODATA_PCLAT -1 -#define PCCARD_STR_IODATA_PCLAT "IO-DATA PCLA/T" +#define PCCARD_CIS_NDC_ND5100_E { "NDC", "Ethernet", "A", NULL } +#define PCCARD_PRODUCT_NDC_ND5100_E -1 +#define PCCARD_STR_NDC_ND5100_E "Sohoware ND5100E NE2000 Compatible Card" +#define PCCARD_CIS_INTERSIL_PRISM2 { "INTERSIL", "HFA384x/IEEE", "Version 01.02", NULL} +#define PCCARD_PRODUCT_INTERSIL_PRISM2 -1 +#define PCCARD_STR_INTERSIL_PRISM2 "Intersil Prism II" diff --git a/sys/dev/pccard/pccarddevs_data.h b/sys/dev/pccard/pccarddevs_data.h index 7a8c03b..ea12db1 100644 --- a/sys/dev/pccard/pccarddevs_data.h +++ b/sys/dev/pccard/pccarddevs_data.h @@ -4,9 +4,9 @@ * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.4 2000/03/25 04:04:24 imp Exp + * FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.5 2000/08/24 07:01:12 imp Exp */ -/* $NetBSD: pcmciadevs,v 1.85 2000/03/22 21:39:57 mycroft Exp $ +/* $NetBSD: pcmciadevs,v 1.97 2000/07/26 07:24:15 onoe Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -46,18 +46,25 @@ struct pccard_knowndev pccard_knowndevs[] = { { - PCCARD_VENDOR_ADAPTEC, PCCARD_PRODUCT_ADAPTEC_APA1460_1, - PCCARD_CIS_ADAPTEC_APA1460_1, + PCCARD_VENDOR_ADAPTEC, PCCARD_PRODUCT_ADAPTEC_APA1460, + PCCARD_CIS_ADAPTEC_APA1460, 0, "Adaptec Corporation", - "Adaptec APA-1460/A SCSI Host Adapter" }, + "Adaptec APA-1460 SlimSCSI" }, }, { - PCCARD_VENDOR_ADAPTEC, PCCARD_PRODUCT_ADAPTEC_APA1460_2, - PCCARD_CIS_ADAPTEC_APA1460_2, + PCCARD_VENDOR_ADAPTEC, PCCARD_PRODUCT_ADAPTEC_APA1460A, + PCCARD_CIS_ADAPTEC_APA1460A, 0, "Adaptec Corporation", - "Adaptec APA-1460/B SCSI Host Adapter" }, + "Adaptec APA-1460A SlimSCSI" }, + }, + { + PCCARD_VENDOR_3COM, PCCARD_PRODUCT_3COM_3CRWE737A, + PCCARD_CIS_3COM_3CRWE737A, + 0, + "3Com Corporation", + "3Com AirConnect Wireless LAN" }, }, { PCCARD_VENDOR_3COM, PCCARD_PRODUCT_3COM_3C1, @@ -116,6 +123,13 @@ struct pccard_knowndev pccard_knowndevs[] = { "3Com/Megahertz 3CCFEM556BI Ethernet/Modem" }, }, { + PCCARD_VENDOR_COMPAQ2, PCCARD_PRODUCT_COMPAQ2_CPQ_10_100, + PCCARD_CIS_COMPAQ2_CPQ_10_100, + 0, + "Compaq", + "Compaq Netelligent 10/100 Ethernet" }, + }, + { PCCARD_VENDOR_COMPEX, PCCARD_PRODUCT_COMPEX_LINKPORT_ENET_B, PCCARD_CIS_COMPEX_LINKPORT_ENET_B, 0, @@ -190,28 +204,35 @@ struct pccard_knowndev pccard_knowndevs[] = { PCCARD_CIS_IBM_3270, 0, "IBM Corporation", - "3270 Emulation" }, + "IBM 3270 Emulation" }, }, { PCCARD_VENDOR_IBM, PCCARD_PRODUCT_IBM_INFOMOVER, PCCARD_CIS_IBM_INFOMOVER, 0, "IBM Corporation", - "National Semiconductor InfoMover" }, + "IBM InfoMover" }, }, { PCCARD_VENDOR_IBM, PCCARD_PRODUCT_IBM_5250, PCCARD_CIS_IBM_5250, 0, "IBM Corporation", - "5250 Emulation" }, + "IBM 5250 Emulation" }, }, { PCCARD_VENDOR_IBM, PCCARD_PRODUCT_IBM_TROPIC, PCCARD_CIS_IBM_TROPIC, 0, "IBM Corporation", - "Token Ring 4/16" }, + "IBM Token Ring 4/16" }, + }, + { + PCCARD_VENDOR_IBM, PCCARD_PRODUCT_IBM_PORTABLE_CDROM, + PCCARD_CIS_IBM_PORTABLE_CDROM, + 0, + "IBM Corporation", + "IBM PCMCIA Portable CD-ROM Drive" }, }, { PCCARD_VENDOR_IBM, PCCARD_PRODUCT_IBM_HOME_AND_AWAY, @@ -225,14 +246,7 @@ struct pccard_knowndev pccard_knowndevs[] = { PCCARD_CIS_IBM_WIRELESS_LAN_ENTRY, 0, "IBM Corporation", - "Wireless LAN Entry" }, - }, - { - PCCARD_VENDOR_IBM, PCCARD_PRODUCT_IBM_PORTABLE_CDROM, - PCCARD_CIS_IBM_PORTABLE_CDROM, - 0, - "IBM Corporation", - "PCMCIA Portable CD-ROM Drive" }, + "IBM Wireless LAN Entry" }, }, { PCCARD_VENDOR_IBM, PCCARD_PRODUCT_IBM_ETHERJET, @@ -242,6 +256,13 @@ struct pccard_knowndev pccard_knowndevs[] = { "IBM EtherJet Ethernet" }, }, { + PCCARD_VENDOR_INTEL, PCCARD_PRODUCT_INTEL_EEPRO100, + PCCARD_CIS_INTEL_EEPRO100, + 0, + "Intel", + "Intel EtherExpress PRO/100" }, + }, + { PCCARD_VENDOR_IODATA, PCCARD_PRODUCT_IODATA_PCLATE, PCCARD_CIS_IODATA_PCLATE, 0, @@ -249,6 +270,13 @@ struct pccard_knowndev pccard_knowndevs[] = { "I-O DATA PCLA/TE" }, }, { + PCCARD_VENDOR_FARALLON, PCCARD_PRODUCT_FARALLON_SKYLINE, + PCCARD_CIS_FARALLON_SKYLINE, + 0, + "Farallon Communications", + "SkyLINE Wireless" }, + }, + { PCCARD_VENDOR_LEXARMEDIA, PCCARD_PRODUCT_LEXARMEDIA_COMPATFLASH, PCCARD_CIS_LEXARMEDIA_COMPATFLASH, 0, @@ -333,6 +361,13 @@ struct pccard_knowndev pccard_knowndevs[] = { "Nokia C020 WLAN Card" }, }, { + PCCARD_VENDOR_OLICOM, PCCARD_PRODUCT_OLICOM_TR, + PCCARD_CIS_OLICOM_TR, + 0, + "Olicom", + "GoCard Token Ring 16/4" }, + }, + { PCCARD_VENDOR_PANASONIC, PCCARD_PRODUCT_PANASONIC_KXLC002, PCCARD_CIS_PANASONIC_KXLC002, 0, @@ -340,6 +375,13 @@ struct pccard_knowndev pccard_knowndevs[] = { "Panasonic 4X CD-ROM Interface Card" }, }, { + PCCARD_VENDOR_PANASONIC, PCCARD_PRODUCT_PANASONIC_KXLC003, + PCCARD_CIS_PANASONIC_KXLC003, + 0, + "Matsushita Electric Industrial Co.", + "Panasonic 8X CD-ROM Interface Card" }, + }, + { PCCARD_VENDOR_USROBOTICS, PCCARD_PRODUCT_USROBOTICS_WORLDPORT144, PCCARD_CIS_USROBOTICS_WORLDPORT144, 0, @@ -410,66 +452,87 @@ struct pccard_knowndev pccard_knowndevs[] = { "TDK LAC-CF010" }, }, { - PCCARD_VENDOR_TDK, PCCARD_PRODUCT_TDK_XIR_CE_10, - PCCARD_CIS_TDK_XIR_CE_10, + PCCARD_VENDOR_XIRCOM, PCCARD_PRODUCT_XIRCOM_CE, + PCCARD_CIS_XIRCOM_CE, 0, - "TDK Corporation", + "Xircom", "Xircom CreditCard Ethernet" }, }, { - PCCARD_VENDOR_TDK, PCCARD_PRODUCT_TDK_XIR_CEM_10, - PCCARD_CIS_TDK_XIR_CEM_10, + PCCARD_VENDOR_XIRCOM, PCCARD_PRODUCT_XIRCOM_CE2, + PCCARD_CIS_XIRCOM_CE2, 0, - "TDK Corporation", + "Xircom", + "Xircom CreditCard Ethernet II" }, + }, + { + PCCARD_VENDOR_XIRCOM, PCCARD_PRODUCT_XIRCOM_CE3, + PCCARD_CIS_XIRCOM_CE3, + 0, + "Xircom", + "Xircom CreditCard 10/100 Ethernet" }, + }, + { + PCCARD_VENDOR_XIRCOM, PCCARD_PRODUCT_XIRCOM_CEM, + PCCARD_CIS_XIRCOM_CEM, + 0, + "Xircom", "Xircom CreditCard Ethernet + Modem" }, }, { - PCCARD_VENDOR_TDK, PCCARD_PRODUCT_TDK_XIR_CEM_28, - PCCARD_CIS_TDK_XIR_CEM_28, + PCCARD_VENDOR_XIRCOM, PCCARD_PRODUCT_XIRCOM_CEM28, + PCCARD_CIS_XIRCOM_CEM28, 0, - "TDK Corporation", - "Xircom CreditCard Ethernet + Modem 28.8" }, + "Xircom", + "Xircom CreditCard Ethernet + Modem 28" }, }, { - PCCARD_VENDOR_TDK, PCCARD_PRODUCT_TDK_XIR_PS_CE2_10, - PCCARD_CIS_TDK_XIR_PS_CE2_10, + PCCARD_VENDOR_XIRCOM, PCCARD_PRODUCT_XIRCOM_CEM33, + PCCARD_CIS_XIRCOM_CEM33, 0, - "TDK Corporation", - "Xircom CreditCard CE2 Ethernet" }, + "Xircom", + "Xircom CreditCard Ethernet + Modem 33" }, }, { - PCCARD_VENDOR_TDK, PCCARD_PRODUCT_TDK_XIR_CE3_10_100, - PCCARD_CIS_TDK_XIR_CE3_10_100, + PCCARD_VENDOR_XIRCOM, PCCARD_PRODUCT_XIRCOM_CEM56, + PCCARD_CIS_XIRCOM_CEM56, 0, - "TDK Corporation", - "Xircom CreditCard CE3 10/100 Ethernet" }, + "Xircom", + "Xircom CreditCard Ethernet + Modem 56" }, }, { - PCCARD_VENDOR_TDK, PCCARD_PRODUCT_TDK_XIR_CNW_801, - PCCARD_CIS_TDK_XIR_CNW_801, + PCCARD_VENDOR_XIRCOM, PCCARD_PRODUCT_XIRCOM_REM56, + PCCARD_CIS_XIRCOM_REM56, 0, - "TDK Corporation", + "Xircom", + "Xircom RealPort Ethernet 10/100 + Modem 56" }, + }, + { + PCCARD_VENDOR_XIRCOM, PCCARD_PRODUCT_XIRCOM_CNW_801, + PCCARD_CIS_XIRCOM_CNW_801, + 0, + "Xircom", "Xircom CreditCard Netwave (Canada)" }, }, { - PCCARD_VENDOR_TDK, PCCARD_PRODUCT_TDK_XIR_CNW_802, - PCCARD_CIS_TDK_XIR_CNW_802, + PCCARD_VENDOR_XIRCOM, PCCARD_PRODUCT_XIRCOM_CNW_802, + PCCARD_CIS_XIRCOM_CNW_802, 0, - "TDK Corporation", + "Xircom", "Xircom CreditCard Netwave (US)" }, }, { PCCARD_VENDOR_NEWMEDIA, PCCARD_PRODUCT_NEWMEDIA_BASICS, PCCARD_CIS_NEWMEDIA_BASICS, 0, - "NewMedia Corporation", + "New Media Corporation", "New Media BASICS Ethernet" }, }, { PCCARD_VENDOR_NEWMEDIA, PCCARD_PRODUCT_NEWMEDIA_BUSTOASTER, PCCARD_CIS_NEWMEDIA_BUSTOASTER, 0, - "NewMedia Corporation", + "New Media Corporation", "New Media BusToaster SCSI Host Adapter" }, }, { @@ -557,6 +620,20 @@ struct pccard_knowndev pccard_knowndevs[] = { "WLAN Adapter" }, }, { + PCCARD_VENDOR_RATOC, PCCARD_PRODUCT_RATOC_REX_R280, + PCCARD_CIS_RATOC_REX_R280, + 0, + "RATOC System Inc.", + "RATOC REX-R280" }, + }, + { + PCCARD_VENDOR_SAMSUNG, PCCARD_PRODUCT_SAMSUNG_SWL_2000N, + PCCARD_CIS_SAMSUNG_SWL_2000N, + 0, + "Samsung", + "Samsung MagicLAN SWL-2000N" }, + }, + { PCCARD_VENDOR_UNKNOWN, PCCARD_PRODUCT_MEGAHERTZ_XJ2288, PCCARD_CIS_MEGAHERTZ_XJ2288, 0, @@ -676,6 +753,13 @@ struct pccard_knowndev pccard_knowndevs[] = { "Corega FastEther PCC-TX" }, }, { + PCCARD_VENDOR_UNKNOWN, PCCARD_PRODUCT_COREGA_WIRELESS_LAN_PCC_11, + PCCARD_CIS_COREGA_WIRELESS_LAN_PCC_11, + 0, + "Corega K.K.", + "Corega Wireless LAN PCC-11" }, + }, + { PCCARD_VENDOR_UNKNOWN, PCCARD_PRODUCT_SVEC_COMBOCARD, PCCARD_CIS_SVEC_COMBOCARD, 0, @@ -704,6 +788,20 @@ struct pccard_knowndev pccard_knowndevs[] = { "NAKAGAWA METAL LNT-10TN NE2000 Compatible Card" }, }, { + PCCARD_VENDOR_UNKNOWN, PCCARD_PRODUCT_AMBICOM_AMB8002T, + PCCARD_CIS_AMBICOM_AMB8002T, + 0, + "AmbiCom Inc", + "AmbiCom AMB8002T" }, + }, + { + PCCARD_VENDOR_UNKNOWN, PCCARD_PRODUCT_IODATA_PCLAT, + PCCARD_CIS_IODATA_PCLAT, + 0, + "I-O DATA", + "IO-DATA PCLA/T" }, + }, + { PCCARD_VENDOR_UNKNOWN, PCCARD_PRODUCT_EPSON_EEN10B, PCCARD_CIS_EPSON_EEN10B, 0, @@ -746,18 +844,18 @@ struct pccard_knowndev pccard_knowndevs[] = { "Billionton Systems Inc. LNT-10TN NE2000 Compatible Card" }, }, { - PCCARD_VENDOR_UNKNOWN, PCCARD_PRODUCT_AMBICOM_AMB8002T, - PCCARD_CIS_AMBICOM_AMB8002T, + PCCARD_VENDOR_UNKNOWN, PCCARD_PRODUCT_NDC_ND5100_E, + PCCARD_CIS_NDC_ND5100_E, 0, - "AmbiCom Inc", - "AmbiCom AMB8002T" }, + "", + "Sohoware ND5100E NE2000 Compatible Card" }, }, { - PCCARD_VENDOR_UNKNOWN, PCCARD_PRODUCT_IODATA_PCLAT, - PCCARD_CIS_IODATA_PCLAT, + PCCARD_VENDOR_UNKNOWN, PCCARD_PRODUCT_INTERSIL_PRISM2, + PCCARD_CIS_INTERSIL_PRISM2, 0, - "I-O DATA", - "IO-DATA PCLA/T" }, + "Intersil", + "Intersil Prism II" }, }, { PCCARD_VENDOR_FUJITSU, 0, @@ -784,14 +882,14 @@ struct pccard_knowndev pccard_knowndevs[] = { PCCARD_VENDOR_NEWMEDIA, 0, PCCARD_KNOWNDEV_NOPROD, PCCARD_CIS_INVALID, - "NewMedia Corporation", + "New Media Corporation", NULL, }, { PCCARD_VENDOR_INTEL, 0, PCCARD_KNOWNDEV_NOPROD, PCCARD_CIS_INVALID, - "Intel Corporation", + "Intel", NULL, }, { @@ -865,6 +963,13 @@ struct pccard_knowndev pccard_knowndevs[] = { NULL, }, { + PCCARD_VENDOR_OLICOM, 0, + PCCARD_KNOWNDEV_NOPROD, + PCCARD_CIS_INVALID, + "Olicom", + NULL, + }, + { PCCARD_VENDOR_ADAPTEC, 0, PCCARD_KNOWNDEV_NOPROD, PCCARD_CIS_INVALID, @@ -942,6 +1047,13 @@ struct pccard_knowndev pccard_knowndevs[] = { NULL, }, { + PCCARD_VENDOR_FARALLON, 0, + PCCARD_KNOWNDEV_NOPROD, + PCCARD_CIS_INVALID, + "Farallon Communications", + NULL, + }, + { PCCARD_VENDOR_NOKIA, 0, PCCARD_KNOWNDEV_NOPROD, PCCARD_CIS_INVALID, @@ -949,6 +1061,13 @@ struct pccard_knowndev pccard_knowndevs[] = { NULL, }, { + PCCARD_VENDOR_SAMSUNG, 0, + PCCARD_KNOWNDEV_NOPROD, + PCCARD_CIS_INVALID, + "Samsung", + NULL, + }, + { PCCARD_VENDOR_LASAT, 0, PCCARD_KNOWNDEV_NOPROD, PCCARD_CIS_INVALID, @@ -1130,5 +1249,12 @@ struct pccard_knowndev pccard_knowndevs[] = { "AMD", NULL, }, + { + PCCARD_VENDOR_INTERSIL, 0, + PCCARD_KNOWNDEV_NOPROD, + PCCARD_CIS_INVALID, + "Intersil", + NULL, + }, { 0, 0, { NULL, NULL, NULL, NULL }, 0, NULL, NULL, } }; -- cgit v1.1