commit (re)generated files last.

2 files changed, 334 insertions, 29 deletions

diff --git a/sys/dev/pccard/pccarddevs.h b/sys/dev/pccard/pccarddevs.h
index dcbbba5..633088d 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:
- *	NetBSD: pcmciadevs,v 1.33 1999/02/19 21:49:43 abs Exp 
+ *	FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.2 1999/11/28 05:49:27 imp Exp 
  */
-/* $FreeBSD$ */
+/* $NetBSD: pcmciadevs,v 1.59 1999/11/27 01:03:18 soren Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -65,17 +65,22 @@
 #define	PCCARD_VENDOR_COMPAQ1	0x0138	/* Compaq Corporation (1) */
 #define	PCCARD_VENDOR_LINKSYS	0x0149	/* Linksys Corporation */
 #define	PCCARD_VENDOR_SIMPLETECH	0x014d	/* Simple Technology */
+#define	PCCARD_VENDOR_LUCENT	0x0156	/* Lucent Technologies */
 #define	PCCARD_VENDOR_COMPAQ2	0x0183	/* Compaq Corporation (2) */
 #define	PCCARD_VENDOR_DAYNA	0x0194	/* Dayna Corporation */
 #define	PCCARD_VENDOR_IODATA	0x01bf	/* I-O DATA */
+#define	PCCARD_VENDOR_BAY	0x01eb	/* Bay Networks */
 #define	PCCARD_VENDOR_COMPEX	0x8a01	/* Compex Corporation */
+#define	PCCARD_VENDOR_CONTEC	0xc001	/* Contec */
 #define	PCCARD_VENDOR_COREGA	0xc00f	/* Corega K.K. */
+#define	PCCARD_VENDOR_ALLIEDTELESIS	0xc00f	/* Allied Telesis K.K. */
 #define	PCCARD_VENDOR_HAGIWARASYSCOM	0xc012	/* Hagiwara SYS-COM */
 #define	PCCARD_VENDOR_RATOC	0xc015	/* RATOC System Inc. */
 
 /*
  * List of known products.  Grouped by vendor.
  */
+
 /* Adaptec Products */
 #define	PCCARD_CIS_ADAPTEC_APA1460_1	{ NULL, NULL, NULL, NULL }
 #define	PCCARD_PRODUCT_ADAPTEC_APA1460_1	0x0001
@@ -94,15 +99,29 @@
 #define	PCCARD_CIS_3COM_3C574	{ NULL, NULL, NULL, NULL }
 #define	PCCARD_PRODUCT_3COM_3C574	0x0574
 #define	PCCARD_STR_3COM_3C574	"3Com 3c574-TX 10/100Mbps Ethernet"
+#define	PCCARD_CIS_3COM_3CXM056BNW	{ NULL, NULL, NULL, NULL }
+#define	PCCARD_PRODUCT_3COM_3CXM056BNW	0x002f
+#define	PCCARD_STR_3COM_3CXM056BNW	"3Com/NoteWorthy 3CXM056-BNW 56K Modem"
 #define	PCCARD_CIS_3COM_3CXEM556	{ NULL, NULL, NULL, NULL }
 #define	PCCARD_PRODUCT_3COM_3CXEM556	0x0035
 #define	PCCARD_STR_3COM_3CXEM556	"3Com/Megahertz 3CXEM556 Ethernet/Modem"
+#define	PCCARD_CIS_3COM_3CXEM556INT	{ NULL, NULL, NULL, NULL }
+#define	PCCARD_PRODUCT_3COM_3CXEM556INT	0x003d
+#define	PCCARD_STR_3COM_3CXEM556INT	"3Com/Megahertz 3CXEM556-INT Ethernet/Modem"
+#define	PCCARD_CIS_3COM_3CCFEM556BI	{ NULL, NULL, NULL, NULL }
+#define	PCCARD_PRODUCT_3COM_3CCFEM556BI	0x0556
+#define	PCCARD_STR_3COM_3CCFEM556BI	"3Com/Megahertz 3CCFEM556BI Ethernet/Modem"
 
 /* Compex Products */
 #define	PCCARD_CIS_COMPEX_LINKPORT_ENET_B	{ NULL, NULL, NULL, NULL }
 #define	PCCARD_PRODUCT_COMPEX_LINKPORT_ENET_B	0x0100
 #define	PCCARD_STR_COMPEX_LINKPORT_ENET_B	"Compex Linkport ENET-B Ethernet"
 
+/* Lasat Products */
+#define	PCCARD_CIS_LASAT_CREDIT_288	{ NULL, NULL, NULL, NULL }
+#define	PCCARD_PRODUCT_LASAT_CREDIT_288	0x2811
+#define	PCCARD_STR_LASAT_CREDIT_288	"Lasat Credit 288 Modem"
+
 /* Dayna Products */
 #define	PCCARD_CIS_DAYNA_COMMUNICARD_E_1	{ NULL, NULL, NULL, NULL }
 #define	PCCARD_PRODUCT_DAYNA_COMMUNICARD_E_1	0x002d
@@ -129,24 +148,44 @@
 #define	PCCARD_PRODUCT_MOTOROLA_PM100C	0x0302
 #define	PCCARD_STR_MOTOROLA_PM100C	"Motorola Personal Messenger 100C CDPD Modem"
 
+/* Fujitsu Products */
+#define	PCCARD_CIS_FUJITSU_LA501	{ NULL, NULL, NULL, NULL }
+#define	PCCARD_PRODUCT_FUJITSU_LA501	0x2000
+#define	PCCARD_STR_FUJITSU_LA501	"Fujitsu Towa LA501 Ethernet"
+#define	PCCARD_CIS_FUJITSU_LA10S	{ NULL, NULL, NULL, NULL }
+#define	PCCARD_PRODUCT_FUJITSU_LA10S	0x1003
+#define	PCCARD_STR_FUJITSU_LA10S	"Fujitsu Compact Flash Ethernet"
+
 /* 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_CIS_IBM_INFOMOVER	{ NULL, NULL, NULL, NULL }
 #define	PCCARD_PRODUCT_IBM_INFOMOVER	0x0002
 #define	PCCARD_STR_IBM_INFOMOVER	"National Semiconductor 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_CIS_IBM_TROPIC	{ NULL, NULL, NULL, NULL }
+#define	PCCARD_PRODUCT_IBM_TROPIC	0x001e
+#define	PCCARD_STR_IBM_TROPIC	"Token Ring 4/16"
 #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_DRIVE	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_IBM_PORTABLE_CDROM_DRIVE	0x002d
-#define	PCCARD_STR_IBM_PORTABLE_CDROM_DRIVE	"PCMCIA Portable CD-ROM Drive"
+#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_CIS_IBM_ETHERJET	{ NULL, NULL, NULL, NULL }
+#define	PCCARD_PRODUCT_IBM_ETHERJET	0x003f
+#define	PCCARD_STR_IBM_ETHERJET	"IBM EtherJet Ethernet"
 
 /* I-O DATA */
-#define	PCCARD_CIS_IODATA_PCLAT	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_IODATA_PCLAT	0x2216
-#define	PCCARD_STR_IODATA_PCLAT	"I-O DATA PCLA/T"
+#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"
 
 /* Linksys corporation */
 #define	PCCARD_CIS_LINKSYS_ECARD_1	{ NULL, NULL, NULL, NULL }
@@ -163,6 +202,9 @@
 #define	PCCARD_CIS_MEGAHERTZ_XJ4288	{ NULL, NULL, NULL, NULL }
 #define	PCCARD_PRODUCT_MEGAHERTZ_XJ4288	0x0023
 #define	PCCARD_STR_MEGAHERTZ_XJ4288	"Megahertz XJ4288 Modem"
+#define	PCCARD_CIS_MEGAHERTZ_XJ4336	{ NULL, NULL, NULL, NULL }
+#define	PCCARD_PRODUCT_MEGAHERTZ_XJ4336	0x0027
+#define	PCCARD_STR_MEGAHERTZ_XJ4336	"Megahertz XJ4336 Modem"
 #define	PCCARD_CIS_MEGAHERTZ_XJ5560	{ NULL, NULL, NULL, NULL }
 #define	PCCARD_PRODUCT_MEGAHERTZ_XJ5560	0x0034
 #define	PCCARD_STR_MEGAHERTZ_XJ5560	"Megahertz X-JACK 56kbps Modem"
@@ -187,6 +229,10 @@
 #define	PCCARD_CIS_SIMPLETECH_COMMUNICATOR288	{ NULL, NULL, NULL, NULL }
 #define	PCCARD_PRODUCT_SIMPLETECH_COMMUNICATOR288	0x0100
 #define	PCCARD_STR_SIMPLETECH_COMMUNICATOR288	"Simple Technology 28.8 Communicator"
+/* Simpletech ID also used by Symbol */
+#define	PCCARD_CIS_SIMPLETECH_SPECTRUM24	{ NULL, NULL, NULL, NULL }
+#define	PCCARD_PRODUCT_SIMPLETECH_SPECTRUM24	0x801
+#define	PCCARD_STR_SIMPLETECH_SPECTRUM24	"Symbol Spectrum24 WLAN Adapter"
 
 /* Socket Communications Products */
 #define	PCCARD_CIS_SOCKET_PAGECARD	{ NULL, NULL, NULL, NULL }
@@ -195,6 +241,9 @@
 #define	PCCARD_CIS_SOCKET_DUAL_RS232	{ NULL, NULL, NULL, NULL }
 #define	PCCARD_PRODUCT_SOCKET_DUAL_RS232	0x0006
 #define	PCCARD_STR_SOCKET_DUAL_RS232	"Socket Communications Dual RS232"
+#define	PCCARD_CIS_SOCEKT_LP_ETHER_CF	{ NULL, NULL, NULL, NULL }
+#define	PCCARD_PRODUCT_SOCEKT_LP_ETHER_CF	0x0075
+#define	PCCARD_STR_SOCEKT_LP_ETHER_CF	"Socket Communications Low Power Ethernet CF"
 
 /* TDK Products */
 #define	PCCARD_CIS_TDK_LAK_CD021BX	{ NULL, NULL, NULL, NULL }
@@ -217,31 +266,57 @@
 #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_100	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_TDK_XIR_CE3_100	0x010a
-#define	PCCARD_STR_TDK_XIR_CE3_100	"Xircom CreditCard Ethernet 10/100"
+#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"
 #define	PCCARD_CIS_TDK_XIR_CNW	{ NULL, NULL, NULL, NULL }
 #define	PCCARD_PRODUCT_TDK_XIR_CNW	0x0802
 #define	PCCARD_STR_TDK_XIR_CNW	"Xircom CreditCard Netwave"
 
-/* NewMedia Products */
+/* New Media Products */
 #define	PCCARD_CIS_NEWMEDIA_BASICS	{ NULL, NULL, NULL, NULL }
 #define	PCCARD_PRODUCT_NEWMEDIA_BASICS	0x0019
-#define	PCCARD_STR_NEWMEDIA_BASICS	"NewMedia BASICS Ethernet"
+#define	PCCARD_STR_NEWMEDIA_BASICS	"New Media BASICS Ethernet"
+#define	PCCARD_CIS_NEWMEDIA_BUSTOASTER	{ NULL, NULL, NULL, NULL }
+#define	PCCARD_PRODUCT_NEWMEDIA_BUSTOASTER	0xc102
+#define	PCCARD_STR_NEWMEDIA_BUSTOASTER	"New Media BusToaster SCSI Host Adapter"
 
 /* Standard Microsystems Corporation Products */
 #define	PCCARD_CIS_SMC_8016	{ NULL, NULL, NULL, NULL }
 #define	PCCARD_PRODUCT_SMC_8016	0x0105
 #define	PCCARD_STR_SMC_8016	"SMC 8016 EtherCard"
+#define	PCCARD_CIS_SMC_EZCARD	{ NULL, NULL, NULL, NULL }
+#define	PCCARD_PRODUCT_SMC_EZCARD	0x8022
+#define	PCCARD_STR_SMC_EZCARD	"SMC EXCard 10 PCMCIA"
+
+/* Contec C-NET(PC) */
+#define	PCCARD_CIS_CONTEC_CNETPC	{ NULL, NULL, NULL, NULL }
+#define	PCCARD_PRODUCT_CONTEC_CNETPC	0x0000
+#define	PCCARD_STR_CONTEC_CNETPC	"Contec C-NET(PC)C"
+
+/* Allied Telesis K.K. */
+#define	PCCARD_CIS_ALLIEDTELESIS_LA_PCM	{ NULL, NULL, NULL, NULL }
+#define	PCCARD_PRODUCT_ALLIEDTELESIS_LA_PCM	0x0002
+#define	PCCARD_STR_ALLIEDTELESIS_LA_PCM	"Allied Telesis LA-PCM"
 
 /* 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"
 
+/* Lucent WaveLAN/IEEE */
+#define	PCCARD_CIS_LUCENT_WAVELAN_IEEE	{ NULL, NULL, NULL, NULL }
+#define	PCCARD_PRODUCT_LUCENT_WAVELAN_IEEE	0x0002
+#define	PCCARD_STR_LUCENT_WAVELAN_IEEE	"WaveLAN/IEEE"
+
+#define	PCCARD_CIS_BAY_STACK_650	{ NULL, NULL, NULL, NULL }
+#define	PCCARD_PRODUCT_BAY_STACK_650	0x804
+#define	PCCARD_STR_BAY_STACK_650	"BayStack 650 Wireless LAN"
+
 /* Cards we know only by their cis */
 #define	PCCARD_VENDOR_PREMAX	-1	/* Premax */
 #define	PCCARD_VENDOR_PLANET	-1	/* Planet */
+#define	PCCARD_VENDOR_PLANEX	-1	/* Planex Communications Inc */
 #define	PCCARD_VENDOR_DLINK	-1	/* D-Link */
 #define	PCCARD_VENDOR_RPTI	-1	/* RPTI */
 #define	PCCARD_VENDOR_ACCTON	-1	/* ACCTON */
@@ -250,6 +325,7 @@
 #define	PCCARD_VENDOR_TEAC	-1	/* TEAC */
 #define	PCCARD_VENDOR_SVEC	-1	/* SVEC/Hawking Technology */
 #define	PCCARD_VENDOR_NAKAGAWAMETAL	-1	/* NAKAGAWA METAL */
+#define	PCCARD_VENDOR_AMBICOM	-1	/* AmbiCom Inc */
 
 #define	PCCARD_CIS_MEGAHERTZ_XJ2288	{ "MEGAHERTZ", "MODEM XJ2288", NULL, NULL }
 #define	PCCARD_PRODUCT_MEGAHERTZ_XJ2288	-1
@@ -260,6 +336,13 @@
 #define	PCCARD_CIS_PLANET_SMARTCOM2000	{ "PCMCIA", "UE2212", NULL, NULL }
 #define	PCCARD_PRODUCT_PLANET_SMARTCOM2000	-1
 #define	PCCARD_STR_PLANET_SMARTCOM2000	"Planet SmartCOM 2000"
+/*
+ * vendor ID of FNW-3600-T is LINKSYS(0x0149) and product ID is 0xc1ab, but
+ * it conflicts with LINKSYS Combo EhternetCard.
+ */
+#define	PCCARD_CIS_PLANEX_FNW3600T	{ "Fast Ethernet", "Adapter", "1.0", NULL }
+#define	PCCARD_PRODUCT_PLANEX_FNW3600T	-1
+#define	PCCARD_STR_PLANEX_FNW3600T	"Planex FNW-3600-T"
 #define	PCCARD_CIS_DLINK_DE650	{ "D-Link", "DE-650", NULL, NULL }
 #define	PCCARD_PRODUCT_DLINK_DE650	-1
 #define	PCCARD_STR_DLINK_DE650	"D-Link DE-650"
@@ -284,9 +367,15 @@
 #define	PCCARD_CIS_LINKSYS_ECARD_2	{ "LINKSYS", "E-CARD", NULL, NULL }
 #define	PCCARD_PRODUCT_LINKSYS_ECARD_2	-1
 #define	PCCARD_STR_LINKSYS_ECARD_2	"Linksys E-Card"
-#define	PCCARD_CIS_COREGA_PCC_2	{ "corega K.K.", "corega Ether PCC-T", NULL, NULL }
-#define	PCCARD_PRODUCT_COREGA_PCC_2	-1
-#define	PCCARD_STR_COREGA_PCC_2	"Corega"
+#define	PCCARD_CIS_COREGA_ETHER_PCC_T	{ "corega K.K.", "corega Ether PCC-T", NULL, NULL }
+#define	PCCARD_PRODUCT_COREGA_ETHER_PCC_T	-1
+#define	PCCARD_STR_COREGA_ETHER_PCC_T	"Corega"
+#define	PCCARD_CIS_COREGA_ETHER_II_PCC_T	{ "corega K.K.", "corega EtherII PCC-T", NULL, NULL }
+#define	PCCARD_PRODUCT_COREGA_ETHER_II_PCC_T	-1
+#define	PCCARD_STR_COREGA_ETHER_II_PCC_T	"Corega"
+#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"
 #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"
@@ -298,3 +387,9 @@
 #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"
diff --git a/sys/dev/pccard/pccarddevs_data.h b/sys/dev/pccard/pccarddevs_data.h
index a05cb21..76c9dcd 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:
- *	NetBSD: pcmciadevs,v 1.33 1999/02/19 21:49:43 abs Exp 
+ *	FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.2 1999/11/28 05:49:27 imp Exp 
  */
-/* $FreeBSD$ */
+/* $NetBSD: pcmciadevs,v 1.59 1999/11/27 01:03:18 soren Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -81,6 +81,13 @@ struct pccard_knowndev pccard_knowndevs[] = {
 	    "3Com 3c574-TX 10/100Mbps Ethernet"	},
 	},
 	{
+	    PCCARD_VENDOR_3COM, PCCARD_PRODUCT_3COM_3CXM056BNW,
+	    PCCARD_CIS_3COM_3CXM056BNW,
+	    0,
+	    "3Com Corporation",
+	    "3Com/NoteWorthy 3CXM056-BNW 56K Modem"	},
+	},
+	{
 	    PCCARD_VENDOR_3COM, PCCARD_PRODUCT_3COM_3CXEM556,
 	    PCCARD_CIS_3COM_3CXEM556,
 	    0,
@@ -88,6 +95,20 @@ struct pccard_knowndev pccard_knowndevs[] = {
 	    "3Com/Megahertz 3CXEM556 Ethernet/Modem"	},
 	},
 	{
+	    PCCARD_VENDOR_3COM, PCCARD_PRODUCT_3COM_3CXEM556INT,
+	    PCCARD_CIS_3COM_3CXEM556INT,
+	    0,
+	    "3Com Corporation",
+	    "3Com/Megahertz 3CXEM556-INT Ethernet/Modem"	},
+	},
+	{
+	    PCCARD_VENDOR_3COM, PCCARD_PRODUCT_3COM_3CCFEM556BI,
+	    PCCARD_CIS_3COM_3CCFEM556BI,
+	    0,
+	    "3Com Corporation",
+	    "3Com/Megahertz 3CCFEM556BI Ethernet/Modem"	},
+	},
+	{
 	    PCCARD_VENDOR_COMPEX, PCCARD_PRODUCT_COMPEX_LINKPORT_ENET_B,
 	    PCCARD_CIS_COMPEX_LINKPORT_ENET_B,
 	    0,
@@ -95,6 +116,13 @@ struct pccard_knowndev pccard_knowndevs[] = {
 	    "Compex Linkport ENET-B Ethernet"	},
 	},
 	{
+	    PCCARD_VENDOR_LASAT, PCCARD_PRODUCT_LASAT_CREDIT_288,
+	    PCCARD_CIS_LASAT_CREDIT_288,
+	    0,
+	    "",
+	    "Lasat Credit 288 Modem"	},
+	},
+	{
 	    PCCARD_VENDOR_DAYNA, PCCARD_PRODUCT_DAYNA_COMMUNICARD_E_1,
 	    PCCARD_CIS_DAYNA_COMMUNICARD_E_1,
 	    0,
@@ -137,6 +165,27 @@ struct pccard_knowndev pccard_knowndevs[] = {
 	    "Motorola Personal Messenger 100C CDPD Modem"	},
 	},
 	{
+	    PCCARD_VENDOR_FUJITSU, PCCARD_PRODUCT_FUJITSU_LA501,
+	    PCCARD_CIS_FUJITSU_LA501,
+	    0,
+	    "Fujitsu Corporation",
+	    "Fujitsu Towa LA501 Ethernet"	},
+	},
+	{
+	    PCCARD_VENDOR_FUJITSU, PCCARD_PRODUCT_FUJITSU_LA10S,
+	    PCCARD_CIS_FUJITSU_LA10S,
+	    0,
+	    "Fujitsu Corporation",
+	    "Fujitsu Compact Flash Ethernet"	},
+	},
+	{
+	    PCCARD_VENDOR_IBM, PCCARD_PRODUCT_IBM_3270,
+	    PCCARD_CIS_IBM_3270,
+	    0,
+	    "IBM Corporation",
+	    "3270 Emulation"	},
+	},
+	{
 	    PCCARD_VENDOR_IBM, PCCARD_PRODUCT_IBM_INFOMOVER,
 	    PCCARD_CIS_IBM_INFOMOVER,
 	    0,
@@ -144,6 +193,20 @@ struct pccard_knowndev pccard_knowndevs[] = {
 	    "National Semiconductor InfoMover"	},
 	},
 	{
+	    PCCARD_VENDOR_IBM, PCCARD_PRODUCT_IBM_5250,
+	    PCCARD_CIS_IBM_5250,
+	    0,
+	    "IBM Corporation",
+	    "5250 Emulation"	},
+	},
+	{
+	    PCCARD_VENDOR_IBM, PCCARD_PRODUCT_IBM_TROPIC,
+	    PCCARD_CIS_IBM_TROPIC,
+	    0,
+	    "IBM Corporation",
+	    "Token Ring 4/16"	},
+	},
+	{
 	    PCCARD_VENDOR_IBM, PCCARD_PRODUCT_IBM_HOME_AND_AWAY,
 	    PCCARD_CIS_IBM_HOME_AND_AWAY,
 	    0,
@@ -158,18 +221,25 @@ struct pccard_knowndev pccard_knowndevs[] = {
 	    "Wireless LAN Entry"	},
 	},
 	{
-	    PCCARD_VENDOR_IBM, PCCARD_PRODUCT_IBM_PORTABLE_CDROM_DRIVE,
-	    PCCARD_CIS_IBM_PORTABLE_CDROM_DRIVE,
+	    PCCARD_VENDOR_IBM, PCCARD_PRODUCT_IBM_PORTABLE_CDROM,
+	    PCCARD_CIS_IBM_PORTABLE_CDROM,
 	    0,
 	    "IBM Corporation",
 	    "PCMCIA Portable CD-ROM Drive"	},
 	},
 	{
-	    PCCARD_VENDOR_IODATA, PCCARD_PRODUCT_IODATA_PCLAT,
-	    PCCARD_CIS_IODATA_PCLAT,
+	    PCCARD_VENDOR_IBM, PCCARD_PRODUCT_IBM_ETHERJET,
+	    PCCARD_CIS_IBM_ETHERJET,
+	    0,
+	    "IBM Corporation",
+	    "IBM EtherJet Ethernet"	},
+	},
+	{
+	    PCCARD_VENDOR_IODATA, PCCARD_PRODUCT_IODATA_PCLATE,
+	    PCCARD_CIS_IODATA_PCLATE,
 	    0,
 	    "I-O DATA",
-	    "I-O DATA PCLA/T"	},
+	    "I-O DATA PCLA/TE"	},
 	},
 	{
 	    PCCARD_VENDOR_LINKSYS, PCCARD_PRODUCT_LINKSYS_ECARD_1,
@@ -200,6 +270,13 @@ struct pccard_knowndev pccard_knowndevs[] = {
 	    "Megahertz XJ4288 Modem"	},
 	},
 	{
+	    PCCARD_VENDOR_MEGAHERTZ, PCCARD_PRODUCT_MEGAHERTZ_XJ4336,
+	    PCCARD_CIS_MEGAHERTZ_XJ4336,
+	    0,
+	    "Megahertz Corporation",
+	    "Megahertz XJ4336 Modem"	},
+	},
+	{
 	    PCCARD_VENDOR_MEGAHERTZ, PCCARD_PRODUCT_MEGAHERTZ_XJ5560,
 	    PCCARD_CIS_MEGAHERTZ_XJ5560,
 	    0,
@@ -242,6 +319,13 @@ struct pccard_knowndev pccard_knowndevs[] = {
 	    "Simple Technology 28.8 Communicator"	},
 	},
 	{
+	    PCCARD_VENDOR_SIMPLETECH, PCCARD_PRODUCT_SIMPLETECH_SPECTRUM24,
+	    PCCARD_CIS_SIMPLETECH_SPECTRUM24,
+	    0,
+	    "Simple Technology",
+	    "Symbol Spectrum24 WLAN Adapter"	},
+	},
+	{
 	    PCCARD_VENDOR_SOCKET, PCCARD_PRODUCT_SOCKET_PAGECARD,
 	    PCCARD_CIS_SOCKET_PAGECARD,
 	    0,
@@ -256,6 +340,13 @@ struct pccard_knowndev pccard_knowndevs[] = {
 	    "Socket Communications Dual RS232"	},
 	},
 	{
+	    PCCARD_VENDOR_SOCEKT, PCCARD_PRODUCT_SOCEKT_LP_ETHER_CF,
+	    PCCARD_CIS_SOCEKT_LP_ETHER_CF,
+	    0,
+	    "",
+	    "Socket Communications Low Power Ethernet CF"	},
+	},
+	{
 	    PCCARD_VENDOR_TDK, PCCARD_PRODUCT_TDK_LAK_CD021BX,
 	    PCCARD_CIS_TDK_LAK_CD021BX,
 	    0,
@@ -298,11 +389,11 @@ struct pccard_knowndev pccard_knowndevs[] = {
 	    "Xircom CreditCard CE2 Ethernet"	},
 	},
 	{
-	    PCCARD_VENDOR_TDK, PCCARD_PRODUCT_TDK_XIR_CE3_100,
-	    PCCARD_CIS_TDK_XIR_CE3_100,
+	    PCCARD_VENDOR_TDK, PCCARD_PRODUCT_TDK_XIR_CE3_10_100,
+	    PCCARD_CIS_TDK_XIR_CE3_10_100,
 	    0,
 	    "TDK Corporation",
-	    "Xircom CreditCard Ethernet 10/100"	},
+	    "Xircom CreditCard CE3 10/100 Ethernet"	},
 	},
 	{
 	    PCCARD_VENDOR_TDK, PCCARD_PRODUCT_TDK_XIR_CNW,
@@ -316,7 +407,14 @@ struct pccard_knowndev pccard_knowndevs[] = {
 	    PCCARD_CIS_NEWMEDIA_BASICS,
 	    0,
 	    "NewMedia Corporation",
-	    "NewMedia BASICS Ethernet"	},
+	    "New Media BASICS Ethernet"	},
+	},
+	{
+	    PCCARD_VENDOR_NEWMEDIA, PCCARD_PRODUCT_NEWMEDIA_BUSTOASTER,
+	    PCCARD_CIS_NEWMEDIA_BUSTOASTER,
+	    0,
+	    "NewMedia Corporation",
+	    "New Media BusToaster SCSI Host Adapter"	},
 	},
 	{
 	    PCCARD_VENDOR_SMC, PCCARD_PRODUCT_SMC_8016,
@@ -326,6 +424,27 @@ struct pccard_knowndev pccard_knowndevs[] = {
 	    "SMC 8016 EtherCard"	},
 	},
 	{
+	    PCCARD_VENDOR_SMC, PCCARD_PRODUCT_SMC_EZCARD,
+	    PCCARD_CIS_SMC_EZCARD,
+	    0,
+	    "Standard Microsystems Corporation",
+	    "SMC EXCard 10 PCMCIA"	},
+	},
+	{
+	    PCCARD_VENDOR_CONTEC, PCCARD_PRODUCT_CONTEC_CNETPC,
+	    PCCARD_CIS_CONTEC_CNETPC,
+	    0,
+	    "Contec",
+	    "Contec C-NET(PC)C"	},
+	},
+	{
+	    PCCARD_VENDOR_ALLIEDTELESIS, PCCARD_PRODUCT_ALLIEDTELESIS_LA_PCM,
+	    PCCARD_CIS_ALLIEDTELESIS_LA_PCM,
+	    0,
+	    "Allied Telesis K.K.",
+	    "Allied Telesis LA-PCM"	},
+	},
+	{
 	    PCCARD_VENDOR_RATOC, PCCARD_PRODUCT_RATOC_REX_R280,
 	    PCCARD_CIS_RATOC_REX_R280,
 	    0,
@@ -333,6 +452,20 @@ struct pccard_knowndev pccard_knowndevs[] = {
 	    "RATOC REX-R280"	},
 	},
 	{
+	    PCCARD_VENDOR_LUCENT, PCCARD_PRODUCT_LUCENT_WAVELAN_IEEE,
+	    PCCARD_CIS_LUCENT_WAVELAN_IEEE,
+	    0,
+	    "Lucent Technologies",
+	    "WaveLAN/IEEE"	},
+	},
+	{
+	    PCCARD_VENDOR_BAY, PCCARD_PRODUCT_BAY_STACK_650,
+	    PCCARD_CIS_BAY_STACK_650,
+	    0,
+	    "Bay Networks",
+	    "BayStack 650 Wireless LAN"	},
+	},
+	{
 	    PCCARD_VENDOR_UNKNOWN, PCCARD_PRODUCT_MEGAHERTZ_XJ2288,
 	    PCCARD_CIS_MEGAHERTZ_XJ2288,
 	    0,
@@ -354,6 +487,13 @@ struct pccard_knowndev pccard_knowndevs[] = {
 	    "Planet SmartCOM 2000"	},
 	},
 	{
+	    PCCARD_VENDOR_UNKNOWN, PCCARD_PRODUCT_PLANEX_FNW3600T,
+	    PCCARD_CIS_PLANEX_FNW3600T,
+	    0,
+	    "Planex Communications Inc",
+	    "Planex FNW-3600-T"	},
+	},
+	{
 	    PCCARD_VENDOR_UNKNOWN, PCCARD_PRODUCT_DLINK_DE650,
 	    PCCARD_CIS_DLINK_DE650,
 	    0,
@@ -410,8 +550,22 @@ struct pccard_knowndev pccard_knowndevs[] = {
 	    "Linksys E-Card"	},
 	},
 	{
-	    PCCARD_VENDOR_UNKNOWN, PCCARD_PRODUCT_COREGA_PCC_2,
-	    PCCARD_CIS_COREGA_PCC_2,
+	    PCCARD_VENDOR_UNKNOWN, PCCARD_PRODUCT_COREGA_ETHER_PCC_T,
+	    PCCARD_CIS_COREGA_ETHER_PCC_T,
+	    0,
+	    "Corega K.K.",
+	    "Corega"	},
+	},
+	{
+	    PCCARD_VENDOR_UNKNOWN, PCCARD_PRODUCT_COREGA_ETHER_II_PCC_T,
+	    PCCARD_CIS_COREGA_ETHER_II_PCC_T,
+	    0,
+	    "Corega K.K.",
+	    "Corega"	},
+	},
+	{
+	    PCCARD_VENDOR_UNKNOWN, PCCARD_PRODUCT_COREGA_FAST_ETHER_PCC_TX,
+	    PCCARD_CIS_COREGA_FAST_ETHER_PCC_TX,
 	    0,
 	    "Corega K.K.",
 	    "Corega"	},
@@ -438,6 +592,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_FUJITSU, 0,
 	    PCCARD_KNOWNDEV_NOPROD,
 	    PCCARD_CIS_INVALID,
@@ -557,6 +725,13 @@ struct pccard_knowndev pccard_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    PCCARD_VENDOR_LUCENT, 0,
+	    PCCARD_KNOWNDEV_NOPROD,
+	    PCCARD_CIS_INVALID,
+	    "Lucent Technologies",
+	    NULL,
+	},
+	{
 	    PCCARD_VENDOR_COMPAQ2, 0,
 	    PCCARD_KNOWNDEV_NOPROD,
 	    PCCARD_CIS_INVALID,
@@ -578,6 +753,13 @@ struct pccard_knowndev pccard_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    PCCARD_VENDOR_BAY, 0,
+	    PCCARD_KNOWNDEV_NOPROD,
+	    PCCARD_CIS_INVALID,
+	    "Bay Networks",
+	    NULL,
+	},
+	{
 	    PCCARD_VENDOR_COMPEX, 0,
 	    PCCARD_KNOWNDEV_NOPROD,
 	    PCCARD_CIS_INVALID,
@@ -585,6 +767,13 @@ struct pccard_knowndev pccard_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    PCCARD_VENDOR_CONTEC, 0,
+	    PCCARD_KNOWNDEV_NOPROD,
+	    PCCARD_CIS_INVALID,
+	    "Contec",
+	    NULL,
+	},
+	{
 	    PCCARD_VENDOR_COREGA, 0,
 	    PCCARD_KNOWNDEV_NOPROD,
 	    PCCARD_CIS_INVALID,
@@ -592,6 +781,13 @@ struct pccard_knowndev pccard_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    PCCARD_VENDOR_ALLIEDTELESIS, 0,
+	    PCCARD_KNOWNDEV_NOPROD,
+	    PCCARD_CIS_INVALID,
+	    "Allied Telesis K.K.",
+	    NULL,
+	},
+	{
 	    PCCARD_VENDOR_HAGIWARASYSCOM, 0,
 	    PCCARD_KNOWNDEV_NOPROD,
 	    PCCARD_CIS_INVALID,
@@ -620,6 +816,13 @@ struct pccard_knowndev pccard_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    PCCARD_VENDOR_PLANEX, 0,
+	    PCCARD_KNOWNDEV_NOPROD,
+	    PCCARD_CIS_INVALID,
+	    "Planex Communications Inc",
+	    NULL,
+	},
+	{
 	    PCCARD_VENDOR_DLINK, 0,
 	    PCCARD_KNOWNDEV_NOPROD,
 	    PCCARD_CIS_INVALID,
@@ -675,5 +878,12 @@ struct pccard_knowndev pccard_knowndevs[] = {
 	    "NAKAGAWA METAL",
 	    NULL,
 	},
+	{
+	    PCCARD_VENDOR_AMBICOM, 0,
+	    PCCARD_KNOWNDEV_NOPROD,
+	    PCCARD_CIS_INVALID,
+	    "AmbiCom Inc",
+	    NULL,
+	},
 	{ 0, 0, { NULL, NULL, NULL, NULL }, 0, NULL, NULL, }
 };