regen.

1 files changed, 115 insertions, 150 deletions

diff --git a/sys/dev/pcmcia/pcmciadevs.h b/sys/dev/pcmcia/pcmciadevs.h
index 265c76497ba..9cf993c2a24 100644
--- a/sys/dev/pcmcia/pcmciadevs.h
+++ b/sys/dev/pcmcia/pcmciadevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: pcmciadevs.h,v 1.35 2000/01/31 22:51:48 fgsch Exp $	*/
+/*	$OpenBSD: pcmciadevs.h,v 1.36 2000/02/01 16:58:05 fgsch Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *		OpenBSD: pcmciadevs,v 1.30 2000/01/31 22:50:44 fgsch Exp 
+ *		OpenBSD: pcmciadevs,v 1.31 2000/02/01 16:57:17 fgsch Exp 
  */
 /* $NetBSD: pcmciadevs,v 1.13 1998/08/17 23:10:12 thorpej Exp $ */
 
@@ -65,13 +65,16 @@
 #define	PCMCIA_VENDOR_SIMPLETECH	0x014d	/* Simple Technology */
 #define	PCMCIA_VENDOR_SYMBOL	0x014d	/* Symbol */
 #define	PCMCIA_VENDOR_LUCENT	0x0156	/* Lucent */
+#define	PCMCIA_VENDOR_AIRONET	0x015f	/* Aironet Wireless Communications */
 #define	PCMCIA_VENDOR_COMPAQ2	0x0183	/* Compaq */
 #define	PCMCIA_VENDOR_KINGSTON	0x0186	/* Kingston */
 #define	PCMCIA_VENDOR_DAYNA	0x0194	/* Dayna */
+#define	PCMCIA_VENDOR_RAYTHEON	0x01a6	/* Raytheon */
 #define	PCMCIA_VENDOR_BAY	0x01eb	/* Bay Networks */
 #define	PCMCIA_VENDOR_IODATA	0x01bf	/* I-O DATA */
 #define	PCMCIA_VENDOR_BREEZECOM	0x0a02	/* BreezeCOM */
 #define	PCMCIA_VENDOR_LASAT	0x3401	/* Lasat */
+#define	PCMCIA_VENDOR_LEXARMEDIA	0x4e01	/* Lexar Media */
 #define	PCMCIA_VENDOR_DUAL	0x890f	/* Dual */
 #define	PCMCIA_VENDOR_COMPEX	0x8a01	/* Compex */
 #define	PCMCIA_VENDOR_CONTEC	0xc001	/* Contec */
@@ -82,259 +85,227 @@
 /*
  * List of known products.  Grouped by vendor.
  */
+/* 3COM */
+#define	PCMCIA_CIS_3COM_3CXM056BNW	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_3COM_3CXM056BNW	0x002f
+#define	PCMCIA_CIS_3COM_3CXEM556B	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_3COM_3CXEM556B	0x003d
+#define	PCMCIA_CIS_3COM_3CXEM556	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_3COM_3CXEM556	0x0035
+#define	PCMCIA_CIS_3COM_3CCFEM556BI	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_3COM_3CCFEM556BI	0x0556
+#define	PCMCIA_CIS_3COM_3C562	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_3COM_3C562	0x0562
+#define	PCMCIA_CIS_3COM_3C589	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_3COM_3C589	0x0589
+#define	PCMCIA_CIS_3COM_3C574	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_3COM_3C574	0x0574
+
 /* Adaptec */
 #define	PCMCIA_CIS_ADAPTEC_APA1460_1	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_ADAPTEC_APA1460_1	0x0001
-#define	PCMCIA_STR_ADAPTEC_APA1460_1	"Adaptec APA-1460/A"
 #define	PCMCIA_CIS_ADAPTEC_APA1460_2	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_ADAPTEC_APA1460_2	0x0002
-#define	PCMCIA_STR_ADAPTEC_APA1460_2	"Adaptec APA-1460/B"
+
+/* Aironet */
+#define	PCMCIA_CIS_AIRONET_PC4500	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_AIRONET_PC4500	0x0005
+#define	PCMCIA_CIS_AIRONET_PC4800	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_AIRONET_PC4800	0x0007
 
 /* Allied Telesis K.K. */
 #define	PCMCIA_CIS_ALLIEDTELESIS_LA_PCM	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_ALLIEDTELESIS_LA_PCM	0x0002
-#define	PCMCIA_STR_ALLIEDTELESIS_LA_PCM	"Allied Telesis LA-PCM"
+
+/* Bay Networks */
+#define	PCMCIA_CIS_BAY_STACK_650	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_BAY_STACK_650	0x0804
+#define	PCMCIA_CIS_BAY_STACK_660	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_BAY_STACK_660	0x0807
 
 /* BreezeCOM */
 #define	PCMCIA_CIS_BREEZECOM_BREEZENET	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_BREEZECOM_BREEZENET	0x0102
-#define	PCMCIA_STR_BREEZECOM_BREEZENET	"BreezeCOM BreezeNET IEEE 802.11 FHSS"
-
-/* 3COM */
-#define	PCMCIA_CIS_3COM_3CXEM556B	{ NULL, NULL, NULL, NULL }
-#define	PCMCIA_PRODUCT_3COM_3CXEM556B	0x003d
-#define	PCMCIA_STR_3COM_3CXEM556B	"3Com 3CXEM556B-INT"
-#define	PCMCIA_CIS_3COM_3CXEM556	{ NULL, NULL, NULL, NULL }
-#define	PCMCIA_PRODUCT_3COM_3CXEM556	0x0035
-#define	PCMCIA_STR_3COM_3CXEM556	"3Com 3CXEM556"
-#define	PCMCIA_CIS_3COM_3C562	{ NULL, NULL, NULL, NULL }
-#define	PCMCIA_PRODUCT_3COM_3C562	0x0562
-#define	PCMCIA_STR_3COM_3C562	"3Com 3c562"
-#define	PCMCIA_CIS_3COM_3C589	{ NULL, NULL, NULL, NULL }
-#define	PCMCIA_PRODUCT_3COM_3C589	0x0589
-#define	PCMCIA_STR_3COM_3C589	"3Com 3c589"
-#define	PCMCIA_CIS_3COM_3C574	{ NULL, NULL, NULL, NULL }
-#define	PCMCIA_PRODUCT_3COM_3C574	0x0574
-#define	PCMCIA_STR_3COM_3C574	"3Com 3c574-TX"
 
 /* Contec C-NET(PC) */
 #define	PCMCIA_CIS_CONTEC_CNETPC	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_CONTEC_CNETPC	0x0000
-#define	PCMCIA_STR_CONTEC_CNETPC	"Contec C-NET(PC)C"
 
 /* Compex */
 #define	PCMCIA_CIS_COMPEX_AMP_WIRELESS	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_COMPEX_AMP_WIRELESS	0x0066
-#define	PCMCIA_STR_COMPEX_AMP_WIRELESS	"AMP"
 #define	PCMCIA_CIS_COMPEX_LINKPORT_ENET_B	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_COMPEX_LINKPORT_ENET_B	0x0100
-#define	PCMCIA_STR_COMPEX_LINKPORT_ENET_B	"Compex Linkport ENET-B"
 
 /* Dayna */
 #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 */
 #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"
 
 /* Dual */
 #define	PCMCIA_CIS_DUAL_NE2000	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_DUAL_NE2000	0x0100
-#define	PCMCIA_STR_DUAL_NE2000	"Dual NE2000"
 
 /* Fujitsu */
 #define	PCMCIA_CIS_FUJITSU_SCSI600	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_FUJITSU_SCSI600	0x0401
-#define	PCMCIA_STR_FUJITSU_SCSI600	"Fujitsu 600"
+#define	PCMCIA_CIS_FUJITSU_LA10S	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_FUJITSU_LA10S	0x1003
 #define	PCMCIA_CIS_FUJITSU_LA501	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_FUJITSU_LA501	0x2000
-#define	PCMCIA_STR_FUJITSU_LA501	"Fujitsu Towa LA501"
-
-/* Motorola */
-#define	PCMCIA_CIS_MOTOROLA_POWER144	{ NULL, NULL, NULL, NULL }
-#define	PCMCIA_PRODUCT_MOTOROLA_POWER144	0x0105
-#define	PCMCIA_STR_MOTOROLA_POWER144	"Motorola Power 14.4"
-#define	PCMCIA_CIS_MOTOROLA_PM100C	{ NULL, NULL, NULL, NULL }
-#define	PCMCIA_PRODUCT_MOTOROLA_PM100C	0x0302
-#define	PCMCIA_STR_MOTOROLA_PM100C	"Motorola Personal Messenger 100C CDPD"
-#define	PCMCIA_CIS_MOTOROLA_MONTANA_336	{ NULL, NULL, NULL, NULL }
-#define	PCMCIA_PRODUCT_MOTOROLA_MONTANA_336	0x0505
-#define	PCMCIA_STR_MOTOROLA_MONTANA_336	"Motorola Montana 33.6"
 
 /* IBM */
 #define	PCMCIA_CIS_IBM_INFOMOVER	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_IBM_INFOMOVER	0x0002
-#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	"PCMCIA Portable CD-ROM Drive"
+#define	PCMCIA_CIS_IBM_TROPIC	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_IBM_TROPIC	0x001e
+#define	PCMCIA_CIS_IBM_PORTABLE_CDROM	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_IBM_PORTABLE_CDROM	0x002d
 #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&Away"
 #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"
+#define	PCMCIA_CIS_IBM_ETHERJET	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_IBM_ETHERJET	0x003f
 
 /* I-O DATA */
-#define	PCMCIA_CIS_IODATA_PCLAT	{ NULL, NULL, NULL, NULL }
-#define	PCMCIA_PRODUCT_IODATA_PCLAT	0x2216
-#define	PCMCIA_STR_IODATA_PCLAT	"I-O DATA PCLA/T"
+#define	PCMCIA_CIS_IODATA_PCLATE	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_IODATA_PCLATE	0x2216
 
 /* Intel */
 #define	PCMCIA_CIS_INTEL_EEPRO100	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_INTEL_EEPRO100	0x010a
-#define	PCMCIA_STR_INTEL_EEPRO100	"Intel EtherExpress PRO/100"
 
 /* Kingston */
 #define	PCMCIA_CIS_KINGSTON_KNE_PC2	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_KINGSTON_KNE_PC2	0x0100
-#define	PCMCIA_STR_KINGSTON_KNE_PC2	"Kingston KNE-PC2"
 
 /* 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"
+
+/* Lexar Media */
+#define	PCMCIA_CIS_LEXARMEDIA_COMPATFLASH	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_LEXARMEDIA_COMPATFLASH	0x0100
 
 /* 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)"
-#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_ETHERFAST	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_LINKSYS_ETHERFAST	0x0230
 #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"
-
-/* Lucent technologies corporation */
-#define	PCMCIA_CIS_LUCENT_WAVELAN	{ NULL, NULL, NULL, NULL }
-#define	PCMCIA_PRODUCT_LUCENT_WAVELAN	0x0002
-#define	PCMCIA_STR_LUCENT_WAVELAN	"Lucent WaveLAN IEEE 802.11 DSSS"
 
-/* BayStack 650 FH 802.11 */
-#define	PCMCIA_CIS_BAY_STACK_650	{ NULL, NULL, NULL, NULL }
-#define	PCMCIA_PRODUCT_BAY_STACK_650	0x0804
-#define	PCMCIA_STR_BAY_STACK_650	"BayStack 650"
+/* Lucent WaveLAN/IEEE */
+#define	PCMCIA_CIS_LUCENT_WAVELAN_IEEE	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_LUCENT_WAVELAN_IEEE	0x0002
 
 /* Megahertz */
+#define	PCMCIA_CIS_MEGAHERTZ_XJEM3336	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_MEGAHERTZ_XJEM3336	0x0006
 #define	PCMCIA_CIS_MEGAHERTZ_XJ4288	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_MEGAHERTZ_XJ4288	0x0023
-#define	PCMCIA_STR_MEGAHERTZ_XJ4288	"Megahertz XJ4288"
+#define	PCMCIA_CIS_MEGAHERTZ_XJ4336	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_MEGAHERTZ_XJ4336	0x0027
 #define	PCMCIA_CIS_MEGAHERTZ_XJ5560	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_MEGAHERTZ_XJ5560	0x0034
-#define	PCMCIA_STR_MEGAHERTZ_XJ5560	"Megahertz X-JACK 56kbps"
 #define	PCMCIA_CIS_MEGAHERTZ2_XJEM1144	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_MEGAHERTZ2_XJEM1144	0x0101
-#define	PCMCIA_STR_MEGAHERTZ2_XJEM1144	"Megahertz X-JACK"
 #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_CIS_MEGAHERTZ_XJEM3336	{ NULL, NULL, NULL, NULL }
-#define	PCMCIA_PRODUCT_MEGAHERTZ_XJEM3336	0x0006
-#define	PCMCIA_STR_MEGAHERTZ_XJEM3336	"Megahertz X-JACK"
+
+/* Motorola */
+#define	PCMCIA_CIS_MOTOROLA_POWER144	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_MOTOROLA_POWER144	0x0105
+#define	PCMCIA_CIS_MOTOROLA_PM100C	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_MOTOROLA_PM100C	0x0302
+#define	PCMCIA_CIS_MOTOROLA_MONTANA_336	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_MOTOROLA_MONTANA_336	0x0505
+
+/* NewMedia */
+#define	PCMCIA_CIS_NEWMEDIA_BASICS	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_NEWMEDIA_BASICS	0x0019
+#define	PCMCIA_CIS_NEWMEDIA_MULTIMEDIA	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_NEWMEDIA_MULTIMEDIA	0x100b
+#define	PCMCIA_CIS_NEWMEDIA_BUSTOASTER	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_NEWMEDIA_BUSTOASTER	0xc102
 
 /* Proxim */
 #define	PCMCIA_CIS_PROXIM_ROAMABOUT_2400FH	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_PROXIM_ROAMABOUT_2400FH	0x1058
-#define	PCMCIA_STR_PROXIM_ROAMABOUT_2400FH	"Digital RoamAbout 2400FH"
 #define	PCMCIA_CIS_PROXIM_RANGELAN2_7401	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_PROXIM_RANGELAN2_7401	0x1158
-#define	PCMCIA_STR_PROXIM_RANGELAN2_7401	"Proxim RangeLAN2 7401"
 
 /* Quatech */
 #define	PCMCIA_CIS_QUATECH_DSP_225	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_QUATECH_DSP_225	0x0008
-#define	PCMCIA_STR_QUATECH_DSP_225	"Quatech Dual Serial Port"
 
-/* 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"
+/* Raylink/WebGear */
+#define	PCMCIA_CIS_RAYTHEON_WLAN	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_RAYTHEON_WLAN	0x0000
 
 /* Sandisk */
 #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 */
 #define	PCMCIA_CIS_SIMPLETECH_COMMUNICATOR288	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_SIMPLETECH_COMMUNICATOR288	0x0100
-#define	PCMCIA_STR_SIMPLETECH_COMMUNICATOR288	"Simple Technology 28.8 Communicator"
 
 /* Socket Communications */
 #define	PCMCIA_CIS_SOCKET_PAGECARD	{ NULL, NULL, NULL, NULL }
 #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	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 LP CF"
+
+/* Standard Microsystems Corporation */
+#define	PCMCIA_CIS_SMC_8016	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_SMC_8016	0x0105
+#define	PCMCIA_CIS_SMC_8020	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_SMC_8020	0x0001
+#define	PCMCIA_CIS_SMC_EZCARD	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_SMC_EZCARD	0x8022
 
 /* Symbol */
 #define	PCMCIA_CIS_SYMBOL_SPECTRUM24	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_SYMBOL_SPECTRUM24	0x0801
-#define	PCMCIA_STR_SYMBOL_SPECTRUM24	"Spectrum24 WLAN IEEE 802.11 FHSS"
 
 /* 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_CIS_TDK_DFL9610	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_TDK_DFL9610	0x0d0a
-#define	PCMCIA_STR_TDK_DFL9610	"TDK DFL9610"
+#define	PCMCIA_CIS_TDK_LAK_CF010	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_TDK_LAK_CF010	0x0900
+
+/* US Robotics */
+#define	PCMCIA_CIS_USROBOTICS_WORLDPORT144	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_USROBOTICS_WORLDPORT144	0x3330
 
 /* Xircom */
 #define	PCMCIA_CIS_XIRCOM_XIR_CE_10	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_XIRCOM_XIR_CE_10	0x0108
-#define	PCMCIA_STR_XIRCOM_XIR_CE_10	"Xircom CE10"
+#define	PCMCIA_CIS_XIRCOM_XIR_CE3_10_100	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_XIRCOM_XIR_CE3_10_100	0x010a
 #define	PCMCIA_CIS_XIRCOM_XIR_PS_CE2_10	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_XIRCOM_XIR_PS_CE2_10	0x010b
-#define	PCMCIA_STR_XIRCOM_XIR_PS_CE2_10	"Xircom CE2"
-#define	PCMCIA_CIS_XIRCOM_XIR_CNW	{ NULL, NULL, NULL, NULL }
-#define	PCMCIA_PRODUCT_XIRCOM_XIR_CNW	0x0802
-#define	PCMCIA_STR_XIRCOM_XIR_CNW	"Xircom Netwave"
+#define	PCMCIA_CIS_XIRCOM_XIR_CNW_801	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_XIRCOM_XIR_CNW_801	0x0801
+#define	PCMCIA_CIS_XIRCOM_XIR_CNW_802	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_XIRCOM_XIR_CNW_802	0x0802
 #define	PCMCIA_CIS_XIRCOM_XIR_CEM_10	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_XIRCOM_XIR_CEM_10	0x110a
-#define	PCMCIA_STR_XIRCOM_XIR_CEM_10	"Xircom CEM-10"
 #define	PCMCIA_CIS_XIRCOM_XIR_CEM_28	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_XIRCOM_XIR_CEM_28	0x110b
-#define	PCMCIA_STR_XIRCOM_XIR_CEM_28	"Xircom CEM-28"
-
-/* NewMedia */
-#define	PCMCIA_CIS_NEWMEDIA_BASICS	{ NULL, NULL, NULL, NULL }
-#define	PCMCIA_PRODUCT_NEWMEDIA_BASICS	0x0019
-#define	PCMCIA_STR_NEWMEDIA_BASICS	"NewMedia BASICS"
-#define	PCMCIA_CIS_NEWMEDIA_MULTIMEDIA	{ NULL, NULL, NULL, NULL }
-#define	PCMCIA_PRODUCT_NEWMEDIA_MULTIMEDIA	0x100b
-#define	PCMCIA_STR_NEWMEDIA_MULTIMEDIA	"NewMedia Multimedia"
-#define	PCMCIA_CIS_NEWMEDIA_BUSTOASTER	{ NULL, NULL, NULL, NULL }
-#define	PCMCIA_PRODUCT_NEWMEDIA_BUSTOASTER	0xc102
-#define	PCMCIA_STR_NEWMEDIA_BUSTOASTER	"NewMedia BusToaster"
-
-/* 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_CIS_SMC_8020	{ NULL, NULL, NULL, NULL }
-#define	PCMCIA_PRODUCT_SMC_8020	0x0001
-#define	PCMCIA_STR_SMC_8020	"SMC EtherEZ 8020"
-#define	PCMCIA_CIS_SMC_EZCARD	{ NULL, NULL, NULL, NULL }
-#define	PCMCIA_PRODUCT_SMC_EZCARD	0x8022
-#define	PCMCIA_STR_SMC_EZCARD	"SMC EXCard"
 
 /* Cards we know only by their cis */
 #define	PCMCIA_VENDOR_PREMAX	-1	/* Premax */
@@ -348,79 +319,73 @@
 #define	PCMCIA_VENDOR_TEAC	-1	/* TEAC */
 #define	PCMCIA_VENDOR_SVEC	-1	/* SVEC/Hawking */
 #define	PCMCIA_VENDOR_AMBICOM	-1	/* AmbiCom */
+#define	PCMCIA_VENDOR_EPSON	-1	/* Seiko Epson Corporation */
+#define	PCMCIA_VENDOR_EXP	-1	/* EXP Computer Inc */
 #define	PCMCIA_VENDOR_EDIMAX	-1	/* Edimax */
 #define	PCMCIA_VENDOR_CNET	-1	/* CNet */
+#define	PCMCIA_VENDOR_SHUTTLE	-1	/* Shuttle */
 
 #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 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.
+ * it conflicts with LINKSYS Combo EthernetCard.
  */
-#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_PLANEX_FNW3600T	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_PLANEX_FNW3600T	-1
 #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"
 #define	PCMCIA_CIS_DLINK_DE660	{ "D-Link", "DE-660", NULL, NULL }
 #define	PCMCIA_PRODUCT_DLINK_DE660	PCMCIA_PRODUCT_INVALID
-#define	PCMCIA_STR_DLINK_DE660	"D-Link DE-660"
 #define	PCMCIA_CIS_RPTI_EP401	{ "RPTI", "EP401 Ethernet NE2000 Compatible", NULL, NULL }
 #define	PCMCIA_PRODUCT_RPTI_EP401	PCMCIA_PRODUCT_INVALID
-#define	PCMCIA_STR_RPTI_EP401	"RPTI EP401"
 #define	PCMCIA_CIS_ACCTON_EN2212	{ "ACCTON", "EN2212", NULL, NULL }
 #define	PCMCIA_PRODUCT_ACCTON_EN2212	PCMCIA_PRODUCT_INVALID
-#define	PCMCIA_STR_ACCTON_EN2212	"Accton EN2212"
 #define	PCMCIA_CIS_YEDATA_EXTERNAL_FDD	{ "Y-E DATA", "External FDD", NULL, NULL }
 #define	PCMCIA_PRODUCT_YEDATA_EXTERNAL_FDD	PCMCIA_PRODUCT_INVALID
-#define	PCMCIA_STR_YEDATA_EXTERNAL_FDD	"Y-E DATA External FDD"
 #define	PCMCIA_CIS_DIGITAL_DEPCMXX	{ "DIGITAL", "DEPCM-XX", NULL, NULL }
 #define	PCMCIA_PRODUCT_DIGITAL_DEPCMXX	PCMCIA_PRODUCT_INVALID
-#define	PCMCIA_STR_DIGITAL_DEPCMXX	"DEC DEPCM-BA"
 #define	PCMCIA_CIS_TEAC_IDECARDII	{ NULL, "NinjaATA-", NULL, NULL }
 #define	PCMCIA_PRODUCT_TEAC_IDECARDII	PCMCIA_PRODUCT_INVALID
-#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	PCMCIA_PRODUCT_INVALID
-#define	PCMCIA_STR_LINKSYS_ECARD_2	"Linksys E-Card"
 #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/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 PCMCIA Lan Card"
+/*
+ * vendor ID of PN650TX is LINKSYS(0x0149) and product ID is 0xc1ab, but
+ * it conflicts with LINKSYS Combo EthernetCard.
+ */
+#define	PCMCIA_CIS_SVEC_PN650TX	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_SVEC_PN650TX	-1
 #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_IODATA_PCLAT	{ "I-O DATA", "PCLA", "ETHERNET", NULL }
+#define	PCMCIA_PRODUCT_IODATA_PCLAT	PCMCIA_PRODUCT_INVALID
+#define	PCMCIA_CIS_EPSON_EEN10B	{ "Seiko Epson Corp.", "Ethernet", "P/N: EEN10B Rev. 00", NULL }
+#define	PCMCIA_PRODUCT_EPSON_EEN10B	PCMCIA_PRODUCT_INVALID
+#define	PCMCIA_CIS_EXP_EXPMULTIMEDIA	{ "EXP   ", "PnPIDE", "F1", NULL }
+#define	PCMCIA_PRODUCT_EXP_EXPMULTIMEDIA	PCMCIA_PRODUCT_INVALID
 #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	"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	"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	"Proxim"
 #define	PCMCIA_CIS_EDIMAX_NE2000	{ "PCMCIA", "Ethernet", NULL, NULL }
 #define	PCMCIA_PRODUCT_EDIMAX_NE2000	PCMCIA_PRODUCT_INVALID
-#define	PCMCIA_STR_EDIMAX_NE2000	"Edimax"
 #define	PCMCIA_CIS_CNET_NE2000	{ "CNet", "CN40BC Ethernet", "D", "NE2000" }
 #define	PCMCIA_PRODUCT_CNET_NE2000	PCMCIA_PRODUCT_INVALID
-#define	PCMCIA_STR_CNET_NE2000	"CNet"
+#define	PCMCIA_CIS_SHUTTLE_IDE_ATAPI	{ "SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", NULL, NULL }
+#define	PCMCIA_PRODUCT_SHUTTLE_IDE_ATAPI	PCMCIA_PRODUCT_INVALID