regen.

1 files changed, 49 insertions, 25 deletions

diff --git a/sys/dev/pcmcia/pcmciadevs.h b/sys/dev/pcmcia/pcmciadevs.h
index f7080fc54be..03f62cebcdc 100644
--- a/sys/dev/pcmcia/pcmciadevs.h
+++ b/sys/dev/pcmcia/pcmciadevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: pcmciadevs.h,v 1.28 1999/10/01 04:04:28 downsj Exp $	*/
+/*	$OpenBSD: pcmciadevs.h,v 1.29 1999/10/31 17:34:49 fgsch Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *		OpenBSD: pcmciadevs,v 1.24 1999/10/01 04:04:01 downsj Exp 
+ *		OpenBSD: pcmciadevs,v 1.25 1999/10/31 17:24:04 fgsch Exp 
  */
 /* $NetBSD: pcmciadevs,v 1.13 1998/08/17 23:10:12 thorpej Exp $ */
 
@@ -74,7 +74,7 @@
 #define	PCMCIA_VENDOR_COMPEX	0x8a01	/* Compex */
 #define	PCMCIA_VENDOR_CONTEC	0xc001	/* Contec */
 #define	PCMCIA_VENDOR_COREGA	0xc00f	/* Corega K.K. */
-#define	PCMCIA_VENDOR_ALLIEDTELESIS	0xc00f	/* Allied Telesis K.K */
+#define	PCMCIA_VENDOR_ALLIEDTELESIS	0xc00f	/* Allied Telesis K.K. */
 #define	PCMCIA_VENDOR_HAGIWARASYSCOM	0xc012	/* Hagiwara SYS-COM */
 
 /*
@@ -110,10 +110,10 @@
 #define	PCMCIA_STR_3COM_3C562	"3Com 3c562 33.6 Modem/10Mbps Ethernet"
 #define	PCMCIA_CIS_3COM_3C589	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_3COM_3C589	0x0589
-#define	PCMCIA_STR_3COM_3C589	"3Com 3c589"
+#define	PCMCIA_STR_3COM_3C589	"3Com 3c589 10Mbps Ethernet"
 #define	PCMCIA_CIS_3COM_3C574	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_3COM_3C574	0x0574
-#define	PCMCIA_STR_3COM_3C574	"3Com 3c574-TX"
+#define	PCMCIA_STR_3COM_3C574	"3Com 3c574-TX 10/100Mbps Ethernet"
 
 /* Contec C-NET(PC) */
 #define	PCMCIA_CIS_CONTEC_CNETPC	{ NULL, NULL, NULL, NULL }
@@ -166,13 +166,16 @@
 #define	PCMCIA_STR_IBM_INFOMOVER	"National Semiconductor InfoMover"
 #define	PCMCIA_CIS_IBM_PORTABLE_CDROM_DRIVE	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_IBM_PORTABLE_CDROM_DRIVE	0x002d
-#define	PCMCIA_STR_IBM_PORTABLE_CDROM_DRIVE	"Portable CD-ROM Drive"
+#define	PCMCIA_STR_IBM_PORTABLE_CDROM_DRIVE	"PCMCIA Portable CD-ROM Drive"
 #define	PCMCIA_CIS_IBM_HOME_AND_AWAY	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_IBM_HOME_AND_AWAY	0x002e
-#define	PCMCIA_STR_IBM_HOME_AND_AWAY	"IBM Home and Away"
+#define	PCMCIA_STR_IBM_HOME_AND_AWAY	"IBM Home and Away Modem"
 #define	PCMCIA_CIS_IBM_WIRELESS_LAN_ENTRY	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_IBM_WIRELESS_LAN_ENTRY	0x0032
 #define	PCMCIA_STR_IBM_WIRELESS_LAN_ENTRY	"Wireless LAN Entry"
+#define	PCMCIA_CIS_IBM_ETHERJET_PCCARD	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_IBM_ETHERJET_PCCARD	0x003f
+#define	PCMCIA_STR_IBM_ETHERJET_PCCARD	"IBM EtherJet Ethernet PC Card"
 
 /* I-O DATA */
 #define	PCMCIA_CIS_IODATA_PCLAT	{ NULL, NULL, NULL, NULL }
@@ -192,7 +195,7 @@
 /* Lasat */
 #define	PCMCIA_CIS_LASAT_CREDIT_288	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_LASAT_CREDIT_288	0x2811
-#define	PCMCIA_STR_LASAT_CREDIT_288	"Lasat Credit 288"
+#define	PCMCIA_STR_LASAT_CREDIT_288	"Lasat Credit 288 Modem"
 
 /* Linksys corporation */
 #define	PCMCIA_CIS_LINKSYS_TRUST_COMBO_ECARD	{ NULL, NULL, NULL, NULL }
@@ -216,16 +219,19 @@
 /* Megahertz */
 #define	PCMCIA_CIS_MEGAHERTZ_XJ4288	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_MEGAHERTZ_XJ4288	0x0023
-#define	PCMCIA_STR_MEGAHERTZ_XJ4288	"Megahertz XJ4288"
+#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"
+#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"
+#define	PCMCIA_STR_MEGAHERTZ2_XJEM1144	"Megahertz X-JACK Ethernet Modem"
 #define	PCMCIA_CIS_MEGAHERTZ2_XJACK	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_MEGAHERTZ2_XJACK	0x0103
-#define	PCMCIA_STR_MEGAHERTZ2_XJACK	"Megahertz X-JACK"
+#define	PCMCIA_STR_MEGAHERTZ2_XJACK	"Megahertz X-JACK Ethernet"
+#define	PCMCIA_CIS_MEGAHERTZ_XJEM3336	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_MEGAHERTZ_XJEM3336	0x0006
+#define	PCMCIA_STR_MEGAHERTZ_XJEM3336	"Megahertz X-JACK Ethernet Modem"
 
 /* Proxim */
 #define	PCMCIA_CIS_PROXIM_ROAMABOUT_2400FH	{ NULL, NULL, NULL, NULL }
@@ -243,7 +249,7 @@
 /* US Robotics */
 #define	PCMCIA_CIS_USROBOTICS_WORLDPORT144	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_USROBOTICS_WORLDPORT144	0x3330
-#define	PCMCIA_STR_USROBOTICS_WORLDPORT144	"US Robotics WorldPort 14.4"
+#define	PCMCIA_STR_USROBOTICS_WORLDPORT144	"US Robotics WorldPort 14.4 Modem"
 
 /* Sandisk */
 #define	PCMCIA_CIS_SANDISK_SDCFB	{ NULL, NULL, NULL, NULL }
@@ -262,6 +268,9 @@
 #define	PCMCIA_CIS_SOCKET_DUAL_RS232	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_SOCKET_DUAL_RS232	0x0006
 #define	PCMCIA_STR_SOCKET_DUAL_RS232	"Socket Communications Dual RS232"
+#define	PCMCIA_CIS_SOCKET_LP_ETHER_CF	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_SOCKET_LP_ETHER_CF	0x0075
+#define	PCMCIA_STR_SOCKET_LP_ETHER_CF	"Socket Communications Low Power Ethernet CF"
 
 /* Symbol */
 #define	PCMCIA_CIS_SYMBOL_SPECTRUM24	{ NULL, NULL, NULL, NULL }
@@ -271,10 +280,10 @@
 /* TDK */
 #define	PCMCIA_CIS_TDK_LAK_CD021BX	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_TDK_LAK_CD021BX	0x0200
-#define	PCMCIA_STR_TDK_LAK_CD021BX	"TDK LAK-CD021BX"
+#define	PCMCIA_STR_TDK_LAK_CD021BX	"TDK LAK-CD021BX Ethernet"
 #define	PCMCIA_CIS_TDK_DFL9610	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_TDK_DFL9610	0x0d0a
-#define	PCMCIA_STR_TDK_DFL9610	"TDK DFL9610"
+#define	PCMCIA_STR_TDK_DFL9610	"TDK DFL9610 Ethernet & Digital Cellular"
 
 /* Xircom */
 #define	PCMCIA_CIS_XIRCOM_XIR_CE_10	{ NULL, NULL, NULL, NULL }
@@ -307,7 +316,7 @@
 /* Standard Microsystems Corporation */
 #define	PCMCIA_CIS_SMC_8016	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_SMC_8016	0x0105
-#define	PCMCIA_STR_SMC_8016	"SMC 8016"
+#define	PCMCIA_STR_SMC_8016	"SMC 8016 EtherCard"
 #define	PCMCIA_CIS_SMC_8020	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_SMC_8020	0x0001
 #define	PCMCIA_STR_SMC_8020	"SMC EtherEZ 8020"
@@ -318,6 +327,7 @@
 /* Cards we know only by their cis */
 #define	PCMCIA_VENDOR_PREMAX	-1	/* Premax */
 #define	PCMCIA_VENDOR_PLANET	-1	/* Planet */
+#define	PCMCIA_VENDOR_PLANEX	-1	/* Planex Communications Inc */
 #define	PCMCIA_VENDOR_DLINK	-1	/* D-Link */
 #define	PCMCIA_VENDOR_RPTI	-1	/* RPTI */
 #define	PCMCIA_VENDOR_ACCTON	-1	/* ACCTON */
@@ -325,16 +335,24 @@
 #define	PCMCIA_VENDOR_DIGITAL	-1	/* Digital */
 #define	PCMCIA_VENDOR_TEAC	-1	/* TEAC */
 #define	PCMCIA_VENDOR_SVEC	-1	/* SVEC/Hawking Technology */
+#define	PCMCIA_VENDOR_AMBICOM	-1	/* AmbiCom Inc */
 
 #define	PCMCIA_CIS_MEGAHERTZ_XJ2288	{ "MEGAHERTZ", "MODEM XJ2288", NULL, NULL }
 #define	PCMCIA_PRODUCT_MEGAHERTZ_XJ2288	PCMCIA_PRODUCT_INVALID
-#define	PCMCIA_STR_MEGAHERTZ_XJ2288	"Megahertz XJ2288"
+#define	PCMCIA_STR_MEGAHERTZ_XJ2288	"Megahertz XJ2288 Modem"
 #define	PCMCIA_CIS_PREMAX_PE200	{ "PMX   ", "PE-200", NULL, NULL }
 #define	PCMCIA_PRODUCT_PREMAX_PE200	PCMCIA_PRODUCT_INVALID
 #define	PCMCIA_STR_PREMAX_PE200	"PreMax PE-200"
 #define	PCMCIA_CIS_PLANET_SMARTCOM2000	{ "PCMCIA", "UE2212", NULL, NULL }
 #define	PCMCIA_PRODUCT_PLANET_SMARTCOM2000	PCMCIA_PRODUCT_INVALID
 #define	PCMCIA_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	PCMCIA_CIS_PLANEX_FNW3600T	{ "Fast Ethernet", "Adapter", "1.0", NULL }
+#define	PCMCIA_PRODUCT_PLANEX_FNW3600T	PCMCIA_PRODUCT_INVALID
+#define	PCMCIA_STR_PLANEX_FNW3600T	"Planex FNW-3600-T"
 #define	PCMCIA_CIS_DLINK_DE650	{ "D-Link", "DE-650", NULL, NULL }
 #define	PCMCIA_PRODUCT_DLINK_DE650	PCMCIA_PRODUCT_INVALID
 #define	PCMCIA_STR_DLINK_DE650	"D-Link DE-650"
@@ -359,24 +377,30 @@
 #define	PCMCIA_CIS_LINKSYS_ECARD_2	{ "LINKSYS", "E-CARD", NULL, NULL }
 #define	PCMCIA_PRODUCT_LINKSYS_ECARD_2	PCMCIA_PRODUCT_INVALID
 #define	PCMCIA_STR_LINKSYS_ECARD_2	"Linksys E-Card"
-#define	PCMCIA_CIS_COREGA_PCC_2	{ "corega K.K.", "corega Ether PCC-T", NULL, NULL }
-#define	PCMCIA_PRODUCT_COREGA_PCC_2	PCMCIA_PRODUCT_INVALID
-#define	PCMCIA_STR_COREGA_PCC_2	"Corega"
+#define	PCMCIA_CIS_COREGA_ETHER_PCC_T	{ "corega K.K.", "corega Ether PCC-T", NULL, NULL }
+#define	PCMCIA_PRODUCT_COREGA_ETHER_PCC_T	PCMCIA_PRODUCT_INVALID
+#define	PCMCIA_STR_COREGA_ETHER_PCC_T	"Corega"
+#define	PCMCIA_CIS_COREGA_ETHER_II_PCC_T	{ "corega K.K.", "corega EtherII PCC-T", NULL, NULL }
+#define	PCMCIA_PRODUCT_COREGA_ETHER_II_PCC_T	PCMCIA_PRODUCT_INVALID
+#define	PCMCIA_STR_COREGA_ETHER_II_PCC_T	"Corega"
+#define	PCMCIA_CIS_COREGA_FAST_ETHER_PCC_TX	{ "corega K.K.", "corega FastEther PCC-TX", NULL, NULL }
+#define	PCMCIA_PRODUCT_COREGA_FAST_ETHER_PCC_TX	PCMCIA_PRODUCT_INVALID
+#define	PCMCIA_STR_COREGA_FAST_ETHER_PCC_TX	"Corega"
 #define	PCMCIA_CIS_SVEC_COMBOCARD	{ "Ethernet", "Adapter", NULL, NULL }
 #define	PCMCIA_PRODUCT_SVEC_COMBOCARD	PCMCIA_PRODUCT_INVALID
-#define	PCMCIA_STR_SVEC_COMBOCARD	"SVEC Combo Card"
+#define	PCMCIA_STR_SVEC_COMBOCARD	"SVEC/Hawking Tech. Combo Card"
 #define	PCMCIA_CIS_SVEC_LANCARD	{ "SVEC", "FD605 PCMCIA EtherNet Card", "V1-1", NULL }
 #define	PCMCIA_PRODUCT_SVEC_LANCARD	PCMCIA_PRODUCT_INVALID
-#define	PCMCIA_STR_SVEC_LANCARD	"SVEC Lan Card"
+#define	PCMCIA_STR_SVEC_LANCARD	"SVEC PCMCIA Lan Card"
 #define	PCMCIA_CIS_AMBICOM_AMB8002T	{ "AmbiCom Inc", "AMB8002T", NULL, NULL }
 #define	PCMCIA_PRODUCT_AMBICOM_AMB8002T	PCMCIA_PRODUCT_INVALID
 #define	PCMCIA_STR_AMBICOM_AMB8002T	"AmbiCom AMB8002T"
 #define	PCMCIA_CIS_PROXIM_RL2_7200	{ "PROXIM", "LAN CARD", "RANGELAN2", NULL }
 #define	PCMCIA_PRODUCT_PROXIM_RL2_7200	PCMCIA_PRODUCT_INVALID
-#define	PCMCIA_STR_PROXIM_RL2_7200	"Blah"
+#define	PCMCIA_STR_PROXIM_RL2_7200	"Proxim"
 #define	PCMCIA_CIS_PROXIM_RL2_7400	{ "PROXIM", "LAN PC CARD", "RANGELAN2", NULL }
 #define	PCMCIA_PRODUCT_PROXIM_RL2_7400	PCMCIA_PRODUCT_INVALID
-#define	PCMCIA_STR_PROXIM_RL2_7400	""
+#define	PCMCIA_STR_PROXIM_RL2_7400	"Proxim"
 #define	PCMCIA_CIS_PROXIM_SYMPHONY	{ "PROXIM", "LAN PC CARD", "SYMPHONY", NULL }
 #define	PCMCIA_PRODUCT_PROXIM_SYMPHONY	PCMCIA_PRODUCT_INVALID
-#define	PCMCIA_STR_PROXIM_SYMPHONY	""
+#define	PCMCIA_STR_PROXIM_SYMPHONY	"Proxim"