Sync to 1.16 pccarddevs to get new PCMCIA_ symbols

4 files changed, 570 insertions, 570 deletions

diff --git a/sys/dev/pccard/pccard_cis.c b/sys/dev/pccard/pccard_cis.c
index e52d116..452f60f 100644
--- a/sys/dev/pccard/pccard_cis.c
+++ b/sys/dev/pccard/pccard_cis.c
@@ -89,8 +89,8 @@ pccard_read_cis(struct pccard_softc *sc)
 	state.card->cis1_info[1] = NULL;
 	state.card->cis1_info[2] = NULL;
 	state.card->cis1_info[3] = NULL;
-	state.card->manufacturer = PCCARD_VENDOR_INVALID;
-	state.card->product = PCCARD_PRODUCT_INVALID;
+	state.card->manufacturer = PCMCIA_VENDOR_INVALID;
+	state.card->product = PCMCIA_PRODUCT_INVALID;
 	STAILQ_INIT(&state.card->pf_head);
 
 	state.pf = NULL;
diff --git a/sys/dev/pccard/pccard_cis_quirks.c b/sys/dev/pccard/pccard_cis_quirks.c
index 96ab13c..83abcf6 100644
--- a/sys/dev/pccard/pccard_cis_quirks.c
+++ b/sys/dev/pccard/pccard_cis_quirks.c
@@ -183,23 +183,23 @@ static struct pccard_config_entry pccard_ndc_nd5100_func0_cfe0 = {
 };
 
 static struct pccard_cis_quirk pccard_cis_quirks[] = {
-	{ PCCARD_VENDOR_3COM, PCCARD_PRODUCT_3COM_3CXEM556, PCCARD_CIS_INVALID, 
+	{ PCMCIA_VENDOR_3COM, PCMCIA_PRODUCT_3COM_3CXEM556, PCMCIA_CIS_INVALID, 
 	  &pccard_3cxem556_func0, &pccard_3cxem556_func0_cfe0 },
-	{ PCCARD_VENDOR_3COM, PCCARD_PRODUCT_3COM_3CXEM556, PCCARD_CIS_INVALID,
+	{ PCMCIA_VENDOR_3COM, PCMCIA_PRODUCT_3COM_3CXEM556, PCMCIA_CIS_INVALID,
 	  &pccard_3cxem556_func1, &pccard_3cxem556_func1_cfe0 },
-	{ PCCARD_VENDOR_3COM, PCCARD_PRODUCT_3COM_3CXEM556INT, PCCARD_CIS_INVALID, 
+	{ PCMCIA_VENDOR_3COM, PCMCIA_PRODUCT_3COM_3CXEM556INT, PCMCIA_CIS_INVALID, 
 	  &pccard_3cxem556_func0, &pccard_3cxem556_func0_cfe0 },
-	{ PCCARD_VENDOR_3COM, PCCARD_PRODUCT_3COM_3CXEM556INT, PCCARD_CIS_INVALID,
+	{ PCMCIA_VENDOR_3COM, PCMCIA_PRODUCT_3COM_3CXEM556INT, PCMCIA_CIS_INVALID,
 	  &pccard_3cxem556_func1, &pccard_3cxem556_func1_cfe0 },
-	{ PCCARD_VENDOR_3COM, PCCARD_PRODUCT_3COM_3CCFEM556BI,
-	  PCCARD_CIS_INVALID,
+	{ PCMCIA_VENDOR_3COM, PCMCIA_PRODUCT_3COM_3CCFEM556BI,
+	  PCMCIA_CIS_INVALID,
 	  &pccard_3ccfem556bi_func0, &pccard_3ccfem556bi_func0_cfe0 },
-	{ PCCARD_VENDOR_3COM, PCCARD_PRODUCT_3COM_3CCFEM556BI,
-	  PCCARD_CIS_INVALID,
+	{ PCMCIA_VENDOR_3COM, PCMCIA_PRODUCT_3COM_3CCFEM556BI,
+	  PCMCIA_CIS_INVALID,
 	  &pccard_3ccfem556bi_func1, &pccard_3ccfem556bi_func1_cfe0 },
-	{ PCCARD_VENDOR_INVALID, PCCARD_PRODUCT_INVALID, PCCARD_CIS_SVEC_LANCARD,
+	{ PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, PCMCIA_CIS_SVEC_LANCARD,
 	  &pccard_sveclancard_func0, &pccard_sveclancard_func0_cfe0 },
-	{ PCCARD_VENDOR_INVALID, PCCARD_PRODUCT_INVALID, PCCARD_CIS_NDC_ND5100_E,
+	{ PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, PCMCIA_CIS_NDC_ND5100_E,
 	  &pccard_ndc_nd5100_func0, &pccard_ndc_nd5100_func0_cfe0 },
 };
 	
@@ -220,10 +220,10 @@ void pccard_check_cis_quirks(device_t dev)
 	for (i=0; i<n_pccard_cis_quirks; i++) {
 		if ((sc->card.manufacturer == pccard_cis_quirks[i].manufacturer) &&
 			(sc->card.product == pccard_cis_quirks[i].product) &&
-			(((sc->card.manufacturer != PCCARD_VENDOR_INVALID) &&
-			  (sc->card.product != PCCARD_PRODUCT_INVALID)) ||
-			 ((sc->card.manufacturer == PCCARD_VENDOR_INVALID) &&
-			  (sc->card.product == PCCARD_PRODUCT_INVALID) &&
+			(((sc->card.manufacturer != PCMCIA_VENDOR_INVALID) &&
+			  (sc->card.product != PCMCIA_PRODUCT_INVALID)) ||
+			 ((sc->card.manufacturer == PCMCIA_VENDOR_INVALID) &&
+			  (sc->card.product == PCMCIA_PRODUCT_INVALID) &&
 			  sc->card.cis1_info[0] &&
 			  (strcmp(sc->card.cis1_info[0],
 					  pccard_cis_quirks[i].cis1_info[0]) == 0) &&
diff --git a/sys/dev/pccard/pccarddevs.h b/sys/dev/pccard/pccarddevs.h
index 74dfe04..42cbc9d 100644
--- a/sys/dev/pccard/pccarddevs.h
+++ b/sys/dev/pccard/pccarddevs.h
@@ -4,7 +4,7 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.15 2001/11/11 19:36:44 imp Exp 
+ *	FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.16 2001/11/11 20:15:06 imp Exp 
  */
 /* $NetBSD: pcmciadevs,v 1.144 2001/10/27 08:05:21 ichiro Exp $ */
 
@@ -48,58 +48,58 @@
  * List of known PCMCIA vendors, sorted by numeric ID.
  */
 
-#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	/* 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 */
-#define	PCCARD_VENDOR_MEGAHERTZ	0x0102	/* Megahertz Corporation */
-#define	PCCARD_VENDOR_SOCKET	0x0104	/* Socket Communications */
-#define	PCCARD_VENDOR_TDK	0x0105	/* TDK Corporation */
-#define	PCCARD_VENDOR_XIRCOM	0x0105	/* Xircom */
-#define	PCCARD_VENDOR_SMC	0x0108	/* Standard Microsystems Corporation */
-#define	PCCARD_VENDOR_NI	0x010b	/* National Instruments */
-#define	PCCARD_VENDOR_USROBOTICS	0x0115	/* US Robotics Corporation */
-#define	PCCARD_VENDOR_OLICOM	0x0121	/* Olicom */
-#define	PCCARD_VENDOR_MEGAHERTZ2	0x0128	/* Megahertz Corporation */
-#define	PCCARD_VENDOR_ADAPTEC	0x012f	/* Adaptec Corporation */
-#define	PCCARD_VENDOR_COMPAQ	0x0138	/* Compaq */
-#define	PCCARD_VENDOR_DLINK_2	0x0143	/* D-Link */
-#define	PCCARD_VENDOR_LINKSYS	0x0149	/* Linksys Corporation */
-#define	PCCARD_VENDOR_SIMPLETECH	0x014d	/* Simple Technology */
-#define	PCCARD_VENDOR_LUCENT	0x0156	/* Lucent Technologies */
-#define	PCCARD_VENDOR_AIRONET	0x015f	/* Aironet Wireless Communications */
-#define	PCCARD_VENDOR_PSION	0x016c	/* Psion */
-#define	PCCARD_VENDOR_COMPAQ2	0x0183	/* Compaq */
-#define	PCCARD_VENDOR_KINGSTON	0x0186	/* Kingston */
-#define	PCCARD_VENDOR_DAYNA	0x0194	/* Dayna Corporation */
-#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_TELECOMDEVICE	0x021b	/* Telecom Device */
-#define	PCCARD_VENDOR_NOKIA	0x023d	/* Nokia Communications */
-#define	PCCARD_VENDOR_SAMSUNG	0x0250	/* Samsung */
-#define	PCCARD_VENDOR_SYMBOL	0x026c	/* Symbol */
-#define	PCCARD_VENDOR_BUFFALO	0x026f	/* BUFFALO (Melco Corporation) */
-#define	PCCARD_VENDOR_IODATA2	0x028a	/* I-O DATA */
-#define	PCCARD_VENDOR_LASAT	0x3401	/* Lasat Communications A/S */
-#define	PCCARD_VENDOR_LEXARMEDIA	0x4e01	/* Lexar Media */
-#define	PCCARD_VENDOR_COMPEX	0x8a01	/* Compex Corporation */
-#define	PCCARD_VENDOR_MELCO	0x8a01	/* Melco Corporation */
-#define	PCCARD_VENDOR_ZONET	0x8a01	/* Zonet Technology Inc. */
-#define	PCCARD_VENDOR_CONTEC	0xc001	/* Contec */
-#define	PCCARD_VENDOR_MACNICA	0xc00b	/* MACNICA */
-#define	PCCARD_VENDOR_ROLAND	0xc00c	/* Roland */
-#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. */
-#define	PCCARD_VENDOR_EMTAC	0xc250	/* EMTAC Technology Corporation */
-#define	PCCARD_VENDOR_ELSA	0xd601	/* Elsa */
+#define	PCMCIA_VENDOR_FUJITSU	0x0004	/* Fujitsu Corporation */
+#define	PCMCIA_VENDOR_PANASONIC	0x0032	/* Matsushita Electric Industrial Co. */
+#define	PCMCIA_VENDOR_SANDISK	0x0045	/* Sandisk Corporation */
+#define	PCMCIA_VENDOR_NEWMEDIA	0x0057	/* New Media Corporation */
+#define	PCMCIA_VENDOR_INTEL	0x0089	/* Intel */
+#define	PCMCIA_VENDOR_IBM	0x00a4	/* IBM Corporation */
+#define	PCMCIA_VENDOR_MOTOROLA	0x0109	/* Motorola Corporation */
+#define	PCMCIA_VENDOR_3COM	0x0101	/* 3Com Corporation */
+#define	PCMCIA_VENDOR_MEGAHERTZ	0x0102	/* Megahertz Corporation */
+#define	PCMCIA_VENDOR_SOCKET	0x0104	/* Socket Communications */
+#define	PCMCIA_VENDOR_TDK	0x0105	/* TDK Corporation */
+#define	PCMCIA_VENDOR_XIRCOM	0x0105	/* Xircom */
+#define	PCMCIA_VENDOR_SMC	0x0108	/* Standard Microsystems Corporation */
+#define	PCMCIA_VENDOR_NI	0x010b	/* National Instruments */
+#define	PCMCIA_VENDOR_USROBOTICS	0x0115	/* US Robotics Corporation */
+#define	PCMCIA_VENDOR_OLICOM	0x0121	/* Olicom */
+#define	PCMCIA_VENDOR_MEGAHERTZ2	0x0128	/* Megahertz Corporation */
+#define	PCMCIA_VENDOR_ADAPTEC	0x012f	/* Adaptec Corporation */
+#define	PCMCIA_VENDOR_COMPAQ	0x0138	/* Compaq */
+#define	PCMCIA_VENDOR_DLINK_2	0x0143	/* D-Link */
+#define	PCMCIA_VENDOR_LINKSYS	0x0149	/* Linksys Corporation */
+#define	PCMCIA_VENDOR_SIMPLETECH	0x014d	/* Simple Technology */
+#define	PCMCIA_VENDOR_LUCENT	0x0156	/* Lucent Technologies */
+#define	PCMCIA_VENDOR_AIRONET	0x015f	/* Aironet Wireless Communications */
+#define	PCMCIA_VENDOR_PSION	0x016c	/* Psion */
+#define	PCMCIA_VENDOR_COMPAQ2	0x0183	/* Compaq */
+#define	PCMCIA_VENDOR_KINGSTON	0x0186	/* Kingston */
+#define	PCMCIA_VENDOR_DAYNA	0x0194	/* Dayna Corporation */
+#define	PCMCIA_VENDOR_RAYTHEON	0x01a6	/* Raytheon */
+#define	PCMCIA_VENDOR_IODATA	0x01bf	/* I-O DATA */
+#define	PCMCIA_VENDOR_BAY	0x01eb	/* Bay Networks */
+#define	PCMCIA_VENDOR_FARALLON	0x0200	/* Farallon Communications */
+#define	PCMCIA_VENDOR_TELECOMDEVICE	0x021b	/* Telecom Device */
+#define	PCMCIA_VENDOR_NOKIA	0x023d	/* Nokia Communications */
+#define	PCMCIA_VENDOR_SAMSUNG	0x0250	/* Samsung */
+#define	PCMCIA_VENDOR_SYMBOL	0x026c	/* Symbol */
+#define	PCMCIA_VENDOR_BUFFALO	0x026f	/* BUFFALO (Melco Corporation) */
+#define	PCMCIA_VENDOR_IODATA2	0x028a	/* I-O DATA */
+#define	PCMCIA_VENDOR_LASAT	0x3401	/* Lasat Communications A/S */
+#define	PCMCIA_VENDOR_LEXARMEDIA	0x4e01	/* Lexar Media */
+#define	PCMCIA_VENDOR_COMPEX	0x8a01	/* Compex Corporation */
+#define	PCMCIA_VENDOR_MELCO	0x8a01	/* Melco Corporation */
+#define	PCMCIA_VENDOR_ZONET	0x8a01	/* Zonet Technology Inc. */
+#define	PCMCIA_VENDOR_CONTEC	0xc001	/* Contec */
+#define	PCMCIA_VENDOR_MACNICA	0xc00b	/* MACNICA */
+#define	PCMCIA_VENDOR_ROLAND	0xc00c	/* Roland */
+#define	PCMCIA_VENDOR_COREGA	0xc00f	/* Corega K.K. */
+#define	PCMCIA_VENDOR_ALLIEDTELESIS	0xc00f	/* Allied Telesis K.K. */
+#define	PCMCIA_VENDOR_HAGIWARASYSCOM	0xc012	/* Hagiwara SYS-COM */
+#define	PCMCIA_VENDOR_RATOC	0xc015	/* RATOC System Inc. */
+#define	PCMCIA_VENDOR_EMTAC	0xc250	/* EMTAC Technology Corporation */
+#define	PCMCIA_VENDOR_ELSA	0xd601	/* Elsa */
 
 /*
  * List of known products.  Grouped by vendor, sorted by number within the
@@ -107,613 +107,613 @@
  */
 
 /* 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_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_3C1	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_3COM_3C1	0x0cf1
-#define	PCCARD_STR_3COM_3C1	"3Com Megahertz 3C1 10Mbps LAN CF+ Card"
-#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"
-#define	PCCARD_CIS_3COM_3C562	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_3COM_3C562	0x0562
-#define	PCCARD_STR_3COM_3C562	"3Com 3c562 33.6 Modem/10Mbps Ethernet"
-#define	PCCARD_CIS_3COM_3C589	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_3COM_3C589	0x0589
-#define	PCCARD_STR_3COM_3C589	"3Com 3c589 10Mbps Ethernet"
-#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_3CRWE62092A	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_3COM_3CRWE62092A	0x2092
-#define	PCCARD_STR_3COM_3CRWE62092A	"3Com 3CRWE62092A Wireless LAN"
+#define	PCMCIA_CIS_3COM_3CRWE737A	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_3COM_3CRWE737A	0x0001
+#define	PCMCIA_STR_3COM_3CRWE737A	"3Com AirConnect Wireless LAN"
+#define	PCMCIA_CIS_3COM_3CXM056BNW	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_3COM_3CXM056BNW	0x002f
+#define	PCMCIA_STR_3COM_3CXM056BNW	"3Com/NoteWorthy 3CXM056-BNW 56K Modem"
+#define	PCMCIA_CIS_3COM_3CXEM556	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_3COM_3CXEM556	0x0035
+#define	PCMCIA_STR_3COM_3CXEM556	"3Com/Megahertz 3CXEM556 Ethernet/Modem"
+#define	PCMCIA_CIS_3COM_3CXEM556INT	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_3COM_3CXEM556INT	0x003d
+#define	PCMCIA_STR_3COM_3CXEM556INT	"3Com/Megahertz 3CXEM556-INT Ethernet/Modem"
+#define	PCMCIA_CIS_3COM_3C1	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_3COM_3C1	0x0cf1
+#define	PCMCIA_STR_3COM_3C1	"3Com Megahertz 3C1 10Mbps LAN CF+ Card"
+#define	PCMCIA_CIS_3COM_3CCFEM556BI	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_3COM_3CCFEM556BI	0x0556
+#define	PCMCIA_STR_3COM_3CCFEM556BI	"3Com/Megahertz 3CCFEM556BI Ethernet/Modem"
+#define	PCMCIA_CIS_3COM_3C562	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_3COM_3C562	0x0562
+#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 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 10/100Mbps Ethernet"
+#define	PCMCIA_CIS_3COM_3CRWE62092A	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_3COM_3CRWE62092A	0x2092
+#define	PCMCIA_STR_3COM_3CRWE62092A	"3Com 3CRWE62092A Wireless LAN"
 
 /* Adaptec Products */
-#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"
+#define	PCMCIA_CIS_ADAPTEC_APA1460	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_ADAPTEC_APA1460	0x0001
+#define	PCMCIA_STR_ADAPTEC_APA1460	"Adaptec APA-1460 SlimSCSI"
+#define	PCMCIA_CIS_ADAPTEC_APA1460A	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_ADAPTEC_APA1460A	0x0002
+#define	PCMCIA_STR_ADAPTEC_APA1460A	"Adaptec APA-1460A SlimSCSI"
 
 /* Aironet */
-#define	PCCARD_CIS_AIRONET_PC4500	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_AIRONET_PC4500	0x0005
-#define	PCCARD_STR_AIRONET_PC4500	"Aironet PC4500 Wireless LAN Adapter"
-#define	PCCARD_CIS_AIRONET_PC4800	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_AIRONET_PC4800	0x0007
-#define	PCCARD_STR_AIRONET_PC4800	"Aironet PC4800 Wireless LAN Adapter"
-#define	PCCARD_CIS_AIRONET_350	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_AIRONET_350	0x000a
-#define	PCCARD_STR_AIRONET_350	"Aironet 350 Wireless LAN Adapter"
+#define	PCMCIA_CIS_AIRONET_PC4500	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_AIRONET_PC4500	0x0005
+#define	PCMCIA_STR_AIRONET_PC4500	"Aironet PC4500 Wireless LAN Adapter"
+#define	PCMCIA_CIS_AIRONET_PC4800	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_AIRONET_PC4800	0x0007
+#define	PCMCIA_STR_AIRONET_PC4800	"Aironet PC4800 Wireless LAN Adapter"
+#define	PCMCIA_CIS_AIRONET_350	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_AIRONET_350	0x000a
+#define	PCMCIA_STR_AIRONET_350	"Aironet 350 Wireless LAN Adapter"
 
 /* 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"
+#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	PCCARD_CIS_BAY_STACK_650	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_BAY_STACK_650	0x0804
-#define	PCCARD_STR_BAY_STACK_650	"BayStack 650 Wireless LAN"
-#define	PCCARD_CIS_BAY_SURFER_PRO	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_BAY_SURFER_PRO	0x0806
-#define	PCCARD_STR_BAY_SURFER_PRO	"AirSurfer Pro Wireless LAN"
-#define	PCCARD_CIS_BAY_STACK_660	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_BAY_STACK_660	0x0807
-#define	PCCARD_STR_BAY_STACK_660	"BayStack 660 Wireless LAN"
+#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 Wireless LAN"
+#define	PCMCIA_CIS_BAY_SURFER_PRO	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_BAY_SURFER_PRO	0x0806
+#define	PCMCIA_STR_BAY_SURFER_PRO	"AirSurfer Pro Wireless LAN"
+#define	PCMCIA_CIS_BAY_STACK_660	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_BAY_STACK_660	0x0807
+#define	PCMCIA_STR_BAY_STACK_660	"BayStack 660 Wireless LAN"
 
 /* BUFFALO */
-#define	PCCARD_CIS_BUFFALO_WLI_PCM_S11	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_BUFFALO_WLI_PCM_S11	0x0305
-#define	PCCARD_STR_BUFFALO_WLI_PCM_S11	"BUFFALO AirStation 11Mbps WLAN"
+#define	PCMCIA_CIS_BUFFALO_WLI_PCM_S11	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_BUFFALO_WLI_PCM_S11	0x0305
+#define	PCMCIA_STR_BUFFALO_WLI_PCM_S11	"BUFFALO AirStation 11Mbps WLAN"
 
 /* Compaq Products */
-#define	PCCARD_CIS_COMPAQ_NC5004	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_COMPAQ_NC5004	0x0002
-#define	PCCARD_STR_COMPAQ_NC5004	"Compaq Agency NC5004 Wireless Card"
-#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"
+#define	PCMCIA_CIS_COMPAQ_NC5004	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_COMPAQ_NC5004	0x0002
+#define	PCMCIA_STR_COMPAQ_NC5004	"Compaq Agency NC5004 Wireless Card"
+#define	PCMCIA_CIS_COMPAQ2_CPQ_10_100	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_COMPAQ2_CPQ_10_100	0x010a
+#define	PCMCIA_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
-#define	PCCARD_STR_COMPEX_LINKPORT_ENET_B	"Compex Linkport ENET-B Ethernet"
+#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 Ethernet"
 
 /* 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"
-#define	PCCARD_CIS_CONTEC_FX_DS110_PCC	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_CONTEC_FX_DS110_PCC	0x0008
-#define	PCCARD_STR_CONTEC_FX_DS110_PCC	"Contec FLEXLAN/FX-DS110-PCC"
+#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"
+#define	PCMCIA_CIS_CONTEC_FX_DS110_PCC	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_CONTEC_FX_DS110_PCC	0x0008
+#define	PCMCIA_STR_CONTEC_FX_DS110_PCC	"Contec FLEXLAN/FX-DS110-PCC"
 
 /* Dayna Products */
-#define	PCCARD_CIS_DAYNA_COMMUNICARD_E_1	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_DAYNA_COMMUNICARD_E_1	0x002d
-#define	PCCARD_STR_DAYNA_COMMUNICARD_E_1	"Dayna CommuniCard E"
-#define	PCCARD_CIS_DAYNA_COMMUNICARD_E_2	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_DAYNA_COMMUNICARD_E_2	0x002f
-#define	PCCARD_STR_DAYNA_COMMUNICARD_E_2	"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	PCCARD_CIS_DIGITAL_MOBILE_MEDIA_CDROM	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_DIGITAL_MOBILE_MEDIA_CDROM	0x0d00
-#define	PCCARD_STR_DIGITAL_MOBILE_MEDIA_CDROM	"Digital Mobile Media CD-ROM"
+#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"
 
 /* D-Link Products */
-#define	PCCARD_CIS_DLINK_2_DMF560TX	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_DLINK_2_DMF560TX	0xc0ab
-#define	PCCARD_STR_DLINK_2_DMF560TX	"D-Link DMF-650TX"
+#define	PCMCIA_CIS_DLINK_2_DMF560TX	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_DLINK_2_DMF560TX	0xc0ab
+#define	PCMCIA_STR_DLINK_2_DMF560TX	"D-Link DMF-650TX"
 
 /* ELSA Products */
-#define	PCCARD_CIS_ELSA_MC2_IEEE	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_ELSA_MC2_IEEE	0x0001
-#define	PCCARD_STR_ELSA_MC2_IEEE	"AirLancer MC-2 IEEE"
-#define	PCCARD_CIS_ELSA_XI300_IEEE	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_ELSA_XI300_IEEE	0x0002
-#define	PCCARD_STR_ELSA_XI300_IEEE	"XI300 Wireless LAN"
-#define	PCCARD_CIS_ELSA_XI800_IEEE	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_ELSA_XI800_IEEE	0x0004
-#define	PCCARD_STR_ELSA_XI800_IEEE	"XI800 CF Wireless LAN"
+#define	PCMCIA_CIS_ELSA_MC2_IEEE	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_ELSA_MC2_IEEE	0x0001
+#define	PCMCIA_STR_ELSA_MC2_IEEE	"AirLancer MC-2 IEEE"
+#define	PCMCIA_CIS_ELSA_XI300_IEEE	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_ELSA_XI300_IEEE	0x0002
+#define	PCMCIA_STR_ELSA_XI300_IEEE	"XI300 Wireless LAN"
+#define	PCMCIA_CIS_ELSA_XI800_IEEE	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_ELSA_XI800_IEEE	0x0004
+#define	PCMCIA_STR_ELSA_XI800_IEEE	"XI800 CF Wireless LAN"
 
 /* EMTAC */
-#define	PCCARD_CIS_EMTAC_WLAN	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_EMTAC_WLAN	0x0002
-#define	PCCARD_STR_EMTAC_WLAN	"EMTAC A2424i 11Mbps WLAN Card"
+#define	PCMCIA_CIS_EMTAC_WLAN	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_EMTAC_WLAN	0x0002
+#define	PCMCIA_STR_EMTAC_WLAN	"EMTAC A2424i 11Mbps WLAN Card"
 
 /* Farallon */
-#define	PCCARD_CIS_FARALLON_SKYLINE	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_FARALLON_SKYLINE	0x0a01
-#define	PCCARD_STR_FARALLON_SKYLINE	"SkyLINE Wireless"
+#define	PCMCIA_CIS_FARALLON_SKYLINE	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_FARALLON_SKYLINE	0x0a01
+#define	PCMCIA_STR_FARALLON_SKYLINE	"SkyLINE Wireless"
 
 /* Fujutsu Products */
-#define	PCCARD_CIS_FUJITSU_SCSI600	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_FUJITSU_SCSI600	0x0401
-#define	PCCARD_STR_FUJITSU_SCSI600	"Fujitsu SCSI 600 Interface"
-#define	PCCARD_CIS_FUJITSU_LA10S	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_FUJITSU_LA10S	0x1003
-#define	PCCARD_STR_FUJITSU_LA10S	"Fujitsu Compact Flash Ethernet"
-#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	PCMCIA_CIS_FUJITSU_SCSI600	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_FUJITSU_SCSI600	0x0401
+#define	PCMCIA_STR_FUJITSU_SCSI600	"Fujitsu SCSI 600 Interface"
+#define	PCMCIA_CIS_FUJITSU_LA10S	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_FUJITSU_LA10S	0x1003
+#define	PCMCIA_STR_FUJITSU_LA10S	"Fujitsu Compact Flash Ethernet"
+#define	PCMCIA_CIS_FUJITSU_LA501	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_FUJITSU_LA501	0x2000
+#define	PCMCIA_STR_FUJITSU_LA501	"Fujitsu Towa LA501 Ethernet"
 
 /* IBM Products */
-#define	PCCARD_CIS_IBM_MICRODRIVE	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_IBM_MICRODRIVE	0x0000
-#define	PCCARD_STR_IBM_MICRODRIVE	"IBM Microdrive"
-#define	PCCARD_CIS_IBM_3270	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_IBM_3270	0x0001
-#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	"IBM InfoMover"
-#define	PCCARD_CIS_IBM_5250	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_IBM_5250	0x000b
-#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	"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	"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"
+#define	PCMCIA_CIS_IBM_MICRODRIVE	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_IBM_MICRODRIVE	0x0000
+#define	PCMCIA_STR_IBM_MICRODRIVE	"IBM Microdrive"
+#define	PCMCIA_CIS_IBM_3270	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_IBM_3270	0x0001
+#define	PCMCIA_STR_IBM_3270	"IBM 3270 Emulation"
+#define	PCMCIA_CIS_IBM_INFOMOVER	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_IBM_INFOMOVER	0x0002
+#define	PCMCIA_STR_IBM_INFOMOVER	"IBM InfoMover"
+#define	PCMCIA_CIS_IBM_5250	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_IBM_5250	0x000b
+#define	PCMCIA_STR_IBM_5250	"IBM 5250 Emulation"
+#define	PCMCIA_CIS_IBM_TROPIC	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_IBM_TROPIC	0x001e
+#define	PCMCIA_STR_IBM_TROPIC	"IBM Token Ring 4/16"
+#define	PCMCIA_CIS_IBM_PORTABLE_CDROM	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_IBM_PORTABLE_CDROM	0x002d
+#define	PCMCIA_STR_IBM_PORTABLE_CDROM	"IBM 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 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	"IBM Wireless LAN Entry"
+#define	PCMCIA_CIS_IBM_ETHERJET	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_IBM_ETHERJET	0x003f
+#define	PCMCIA_STR_IBM_ETHERJET	"IBM EtherJet Ethernet"
 
 /* Intel Products */
-#define	PCCARD_CIS_INTEL_PRO_WLAN_2011	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_INTEL_PRO_WLAN_2011	0x0001
-#define	PCCARD_STR_INTEL_PRO_WLAN_2011	"Intel PRO/Wireless 2011 LAN PC Card"
-#define	PCCARD_CIS_INTEL_EEPRO100	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_INTEL_EEPRO100	0x010a
-#define	PCCARD_STR_INTEL_EEPRO100	"Intel EtherExpress PRO/100"
+#define	PCMCIA_CIS_INTEL_PRO_WLAN_2011	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_INTEL_PRO_WLAN_2011	0x0001
+#define	PCMCIA_STR_INTEL_PRO_WLAN_2011	"Intel PRO/Wireless 2011 LAN PC Card"
+#define	PCMCIA_CIS_INTEL_EEPRO100	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_INTEL_EEPRO100	0x010a
+#define	PCMCIA_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"
-#define	PCCARD_CIS_IODATA2_WNB11PCM	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_IODATA2_WNB11PCM	0x0002
-#define	PCCARD_STR_IODATA2_WNB11PCM	"I-O DATA WN-B11/PCM"
+#define	PCMCIA_CIS_IODATA_PCLATE	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_IODATA_PCLATE	0x2216
+#define	PCMCIA_STR_IODATA_PCLATE	"I-O DATA PCLA/TE"
+#define	PCMCIA_CIS_IODATA2_WNB11PCM	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_IODATA2_WNB11PCM	0x0002
+#define	PCMCIA_STR_IODATA2_WNB11PCM	"I-O DATA WN-B11/PCM"
 
 /* Kingston Products */
-#define	PCCARD_CIS_KINGSTON_KNE2	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_KINGSTON_KNE2	0x0100
-#define	PCCARD_STR_KINGSTON_KNE2	"Kingston KNE-PC2 Ethernet"
+#define	PCMCIA_CIS_KINGSTON_KNE2	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_KINGSTON_KNE2	0x0100
+#define	PCMCIA_STR_KINGSTON_KNE2	"Kingston KNE-PC2 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"
+#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 Modem"
 
 /* Lexar Media */
-#define	PCCARD_CIS_LEXARMEDIA_COMPACTFLASH	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_LEXARMEDIA_COMPACTFLASH	0x0100
-#define	PCCARD_STR_LEXARMEDIA_COMPACTFLASH	"Lexar Media CompactFlash"
+#define	PCMCIA_CIS_LEXARMEDIA_COMPACTFLASH	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_LEXARMEDIA_COMPACTFLASH	0x0100
+#define	PCMCIA_STR_LEXARMEDIA_COMPACTFLASH	"Lexar Media CompactFlash"
 
 /* Linksys corporation */
-#define	PCCARD_CIS_LINKSYS_TRUST_COMBO_ECARD	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_LINKSYS_TRUST_COMBO_ECARD	0x021b
-#define	PCCARD_STR_LINKSYS_TRUST_COMBO_ECARD	"Trust (Linksys) Combo EthernetCard"
-#define	PCCARD_CIS_LINKSYS_ETHERFAST	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_LINKSYS_ETHERFAST	0x0230
-#define	PCCARD_STR_LINKSYS_ETHERFAST	"Linksys Etherfast 10/100 Ethernet"
-#define	PCCARD_CIS_LINKSYS_ECARD_1	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_LINKSYS_ECARD_1	0x0265
-#define	PCCARD_STR_LINKSYS_ECARD_1	"Linksys EthernetCard or D-Link DE-650"
-#define	PCCARD_CIS_LINKSYS_COMBO_ECARD	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_LINKSYS_COMBO_ECARD	0xc1ab
-#define	PCCARD_STR_LINKSYS_COMBO_ECARD	"Linksys Combo EthernetCard"
+#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) Combo EthernetCard"
+#define	PCMCIA_CIS_LINKSYS_ETHERFAST	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_LINKSYS_ETHERFAST	0x0230
+#define	PCMCIA_STR_LINKSYS_ETHERFAST	"Linksys Etherfast 10/100 Ethernet"
+#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 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	PCMCIA_CIS_LUCENT_WAVELAN_IEEE	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_LUCENT_WAVELAN_IEEE	0x0002
+#define	PCMCIA_STR_LUCENT_WAVELAN_IEEE	"WaveLAN/IEEE"
 
 /* MACNICA */
-#define	PCCARD_CIS_MACNICA_ME1_JEIDA	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_MACNICA_ME1_JEIDA	0x3300
-#define	PCCARD_STR_MACNICA_ME1_JEIDA	"MACNICA ME1 for JEIDA"
+#define	PCMCIA_CIS_MACNICA_ME1_JEIDA	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_MACNICA_ME1_JEIDA	0x3300
+#define	PCMCIA_STR_MACNICA_ME1_JEIDA	"MACNICA ME1 for JEIDA"
 
 /* Megahertz Products */
-#define	PCCARD_CIS_MEGAHERTZ_XJEM3336	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_MEGAHERTZ_XJEM3336	0x0006
-#define	PCCARD_STR_MEGAHERTZ_XJEM3336	"Megahertz X-JACK Ethernet Modem"
-#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"
-#define	PCCARD_CIS_MEGAHERTZ2_XJACK	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_MEGAHERTZ2_XJACK	0x0103
-#define	PCCARD_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"
+#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_XJ4336	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_MEGAHERTZ_XJ4336	0x0027
+#define	PCMCIA_STR_MEGAHERTZ_XJ4336	"Megahertz XJ4336 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_XJACK	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_MEGAHERTZ2_XJACK	0x0103
+#define	PCMCIA_STR_MEGAHERTZ2_XJACK	"Megahertz X-JACK Ethernet"
 
 /* Melco Products */
-#define	PCCARD_CIS_MELCO_LPC3_TX	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_MELCO_LPC3_TX	0xc1ab
-#define	PCCARD_STR_MELCO_LPC3_TX	"Melco LPC3-TX"
+#define	PCMCIA_CIS_MELCO_LPC3_TX	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_MELCO_LPC3_TX	0xc1ab
+#define	PCMCIA_STR_MELCO_LPC3_TX	"Melco LPC3-TX"
 
 /* Motorola Products */
-#define	PCCARD_CIS_MOTOROLA_POWER144	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_MOTOROLA_POWER144	0x0105
-#define	PCCARD_STR_MOTOROLA_POWER144	"Motorola Power 14.4 Modem"
-#define	PCCARD_CIS_MOTOROLA_PM100C	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_MOTOROLA_PM100C	0x0302
-#define	PCCARD_STR_MOTOROLA_PM100C	"Motorola Personal Messenger 100C CDPD Modem"
+#define	PCMCIA_CIS_MOTOROLA_POWER144	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_MOTOROLA_POWER144	0x0105
+#define	PCMCIA_STR_MOTOROLA_POWER144	"Motorola Power 14.4 Modem"
+#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 Modem"
 
 /* New Media Products */
-#define	PCCARD_CIS_NEWMEDIA_BASICS	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_NEWMEDIA_BASICS	0x0019
-#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"
+#define	PCMCIA_CIS_NEWMEDIA_BASICS	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_NEWMEDIA_BASICS	0x0019
+#define	PCMCIA_STR_NEWMEDIA_BASICS	"New Media BASICS Ethernet"
+#define	PCMCIA_CIS_NEWMEDIA_BUSTOASTER	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_NEWMEDIA_BUSTOASTER	0xc102
+#define	PCMCIA_STR_NEWMEDIA_BUSTOASTER	"New Media BusToaster SCSI Host Adapter"
 
 /* National Instruments */
-#define	PCCARD_CIS_NI_PCMCIA_GPIB	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_NI_PCMCIA_GPIB	0x4882
-#define	PCCARD_STR_NI_PCMCIA_GPIB	"National Instruments PCMCIA-GPIB"
+#define	PCMCIA_CIS_NI_PCMCIA_GPIB	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_NI_PCMCIA_GPIB	0x4882
+#define	PCMCIA_STR_NI_PCMCIA_GPIB	"National Instruments PCMCIA-GPIB"
 
 /* Nokia Products */
-#define	PCCARD_CIS_NOKIA_C020_WLAN	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_NOKIA_C020_WLAN	0x20c0
-#define	PCCARD_STR_NOKIA_C020_WLAN	"Nokia C020 WLAN Card"
+#define	PCMCIA_CIS_NOKIA_C020_WLAN	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_NOKIA_C020_WLAN	0x20c0
+#define	PCMCIA_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"
+#define	PCMCIA_CIS_OLICOM_TR	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_OLICOM_TR	0x2132
+#define	PCMCIA_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"
-#define	PCCARD_CIS_PANASONIC_KXLC005	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_PANASONIC_KXLC005	0x2704
-#define	PCCARD_STR_PANASONIC_KXLC005	"Panasonic 16X CD-ROM Interface Card"
+#define	PCMCIA_CIS_PANASONIC_KXLC002	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_PANASONIC_KXLC002	0x0304
+#define	PCMCIA_STR_PANASONIC_KXLC002	"Panasonic 4X CD-ROM Interface Card"
+#define	PCMCIA_CIS_PANASONIC_KXLC003	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_PANASONIC_KXLC003	0x0504
+#define	PCMCIA_STR_PANASONIC_KXLC003	"Panasonic 8X CD-ROM Interface Card"
+#define	PCMCIA_CIS_PANASONIC_KXLC005	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_PANASONIC_KXLC005	0x2704
+#define	PCMCIA_STR_PANASONIC_KXLC005	"Panasonic 16X CD-ROM Interface Card"
 
 /* Psion */
-#define	PCCARD_CIS_PSION_GOLDCARD	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_PSION_GOLDCARD	0x0020
-#define	PCCARD_STR_PSION_GOLDCARD	"Psion Gold Card"
+#define	PCMCIA_CIS_PSION_GOLDCARD	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_PSION_GOLDCARD	0x0020
+#define	PCMCIA_STR_PSION_GOLDCARD	"Psion Gold Card"
 
 /* RATOC System Inc. Products */
-#define	PCCARD_CIS_RATOC_REX_R280	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_RATOC_REX_R280	0x0001
-#define	PCCARD_STR_RATOC_REX_R280	"RATOC REX-R280"
+#define	PCMCIA_CIS_RATOC_REX_R280	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_RATOC_REX_R280	0x0001
+#define	PCMCIA_STR_RATOC_REX_R280	"RATOC REX-R280"
 
 /* Raylink/WebGear */
-#define	PCCARD_CIS_RAYTHEON_WLAN	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_RAYTHEON_WLAN	0x0000
-#define	PCCARD_STR_RAYTHEON_WLAN	"WLAN Adapter"
+#define	PCMCIA_CIS_RAYTHEON_WLAN	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_RAYTHEON_WLAN	0x0000
+#define	PCMCIA_STR_RAYTHEON_WLAN	"WLAN Adapter"
 
 /* Roland */
-#define	PCCARD_CIS_ROLAND_SCP55	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_ROLAND_SCP55	0x0001
-#define	PCCARD_STR_ROLAND_SCP55	"Roland SCP-55"
+#define	PCMCIA_CIS_ROLAND_SCP55	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_ROLAND_SCP55	0x0001
+#define	PCMCIA_STR_ROLAND_SCP55	"Roland SCP-55"
 
 /* Samsung */
-#define	PCCARD_CIS_SAMSUNG_SWL_2000N	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_SAMSUNG_SWL_2000N	0x0002
-#define	PCCARD_STR_SAMSUNG_SWL_2000N	"Samsung MagicLAN SWL-2000N"
+#define	PCMCIA_CIS_SAMSUNG_SWL_2000N	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_SAMSUNG_SWL_2000N	0x0002
+#define	PCMCIA_STR_SAMSUNG_SWL_2000N	"Samsung MagicLAN SWL-2000N"
 
 /* Sandisk Products */
-#define	PCCARD_CIS_SANDISK_SDCFB	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_SANDISK_SDCFB	0x0401
-#define	PCCARD_STR_SANDISK_SDCFB	"Sandisk CompactFlash Card"
+#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	PCCARD_CIS_SIMPLETECH_COMMUNICATOR288	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_SIMPLETECH_COMMUNICATOR288	0x0100
-#define	PCCARD_STR_SIMPLETECH_COMMUNICATOR288	"Simple Technology 28.8 Communicator"
+#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"
 /* 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"
+#define	PCMCIA_CIS_SIMPLETECH_SPECTRUM24	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_SIMPLETECH_SPECTRUM24	0x801
+#define	PCMCIA_STR_SIMPLETECH_SPECTRUM24	"Symbol Spectrum24 WLAN 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 EZCard 10 PCMCIA"
+#define	PCMCIA_CIS_SMC_8016	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_SMC_8016	0x0105
+#define	PCMCIA_STR_SMC_8016	"SMC 8016 EtherCard"
+#define	PCMCIA_CIS_SMC_EZCARD	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_SMC_EZCARD	0x8022
+#define	PCMCIA_STR_SMC_EZCARD	"SMC EZCard 10 PCMCIA"
 
 /* Socket Communications Products */
-#define	PCCARD_CIS_SOCKET_EA_ETHER	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_SOCKET_EA_ETHER	0x0000
-#define	PCCARD_STR_SOCKET_EA_ETHER	"Socket Communications EA"
-#define	PCCARD_CIS_SOCKET_PAGECARD	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_SOCKET_PAGECARD	0x0003
-#define	PCCARD_STR_SOCKET_PAGECARD	"Socket Communications PageCard"
-#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_SOCKET_LP_ETHER	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_SOCKET_LP_ETHER	0x000d
-#define	PCCARD_STR_SOCKET_LP_ETHER	"Socket Communications LP-E"
-#define	PCCARD_CIS_SOCKET_LP_ETHER_CF	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_SOCKET_LP_ETHER_CF	0x0075
-#define	PCCARD_STR_SOCKET_LP_ETHER_CF	"Socket Communications LP-E CF"
+#define	PCMCIA_CIS_SOCKET_EA_ETHER	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_SOCKET_EA_ETHER	0x0000
+#define	PCMCIA_STR_SOCKET_EA_ETHER	"Socket Communications EA"
+#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	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_SOCKET_LP_ETHER	0x000d
+#define	PCMCIA_STR_SOCKET_LP_ETHER	"Socket Communications LP-E"
+#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-E CF"
 
 /* Symbol */
-#define	PCCARD_CIS_SYMBOL_LA4100	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_SYMBOL_LA4100	0x0001
-#define	PCCARD_STR_SYMBOL_LA4100	"Symbol Spectrum24 LA4100 Series WLAN"
+#define	PCMCIA_CIS_SYMBOL_LA4100	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_SYMBOL_LA4100	0x0001
+#define	PCMCIA_STR_SYMBOL_LA4100	"Symbol Spectrum24 LA4100 Series WLAN"
 
 /* TDK Products */
-#define	PCCARD_CIS_TDK_LAK_CD011WL	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_TDK_LAK_CD011WL	0x0000
-#define	PCCARD_STR_TDK_LAK_CD011WL	"TDK LAK-CD011WL"
-#define	PCCARD_CIS_TDK_LAK_CD021BX	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_TDK_LAK_CD021BX	0x0200
-#define	PCCARD_STR_TDK_LAK_CD021BX	"TDK LAK-CD021BX Ethernet"
-#define	PCCARD_CIS_TDK_LAK_CF010	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_TDK_LAK_CF010	0x0900
-#define	PCCARD_STR_TDK_LAK_CF010	"TDK LAC-CF010"
-#define	PCCARD_CIS_TDK_DFL9610	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_TDK_DFL9610	0x0d0a
-#define	PCCARD_STR_TDK_DFL9610	"TDK DFL9610 Ethernet & Digital Cellular"
+#define	PCMCIA_CIS_TDK_LAK_CD011WL	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_TDK_LAK_CD011WL	0x0000
+#define	PCMCIA_STR_TDK_LAK_CD011WL	"TDK LAK-CD011WL"
+#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 Ethernet"
+#define	PCMCIA_CIS_TDK_LAK_CF010	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_TDK_LAK_CF010	0x0900
+#define	PCMCIA_STR_TDK_LAK_CF010	"TDK LAC-CF010"
+#define	PCMCIA_CIS_TDK_DFL9610	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_TDK_DFL9610	0x0d0a
+#define	PCMCIA_STR_TDK_DFL9610	"TDK DFL9610 Ethernet & Digital Cellular"
 
 /* Telecom Device */
-#define	PCCARD_CIS_TELECOMDEVICE_TCD_HPC100	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_TELECOMDEVICE_TCD_HPC100	0x0202
-#define	PCCARD_STR_TELECOMDEVICE_TCD_HPC100	"Telecom Device TCD-HPC100"
+#define	PCMCIA_CIS_TELECOMDEVICE_TCD_HPC100	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_TELECOMDEVICE_TCD_HPC100	0x0202
+#define	PCMCIA_STR_TELECOMDEVICE_TCD_HPC100	"Telecom Device TCD-HPC100"
 
 /* US Robotics Products */
-#define	PCCARD_CIS_USROBOTICS_WORLDPORT144	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_USROBOTICS_WORLDPORT144	0x3330
-#define	PCCARD_STR_USROBOTICS_WORLDPORT144	"US Robotics WorldPort 14.4 Modem"
+#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 Modem"
 
 /* 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_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)"
-#define	PCCARD_CIS_XIRCOM_CT2	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_XIRCOM_CT2	0x1101
-#define	PCCARD_STR_XIRCOM_CT2	"Xircom CreditCard Token Ring II"
-#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_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_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	PCMCIA_CIS_XIRCOM_CE	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_XIRCOM_CE	0x0108
+#define	PCMCIA_STR_XIRCOM_CE	"Xircom CreditCard Ethernet"
+#define	PCMCIA_CIS_XIRCOM_CE2	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_XIRCOM_CE2	0x010b
+#define	PCMCIA_STR_XIRCOM_CE2	"Xircom CreditCard Ethernet II"
+#define	PCMCIA_CIS_XIRCOM_CE3	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_XIRCOM_CE3	0x010a
+#define	PCMCIA_STR_XIRCOM_CE3	"Xircom CreditCard 10/100 Ethernet"
+#define	PCMCIA_CIS_XIRCOM_CNW_801	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_XIRCOM_CNW_801	0x0801
+#define	PCMCIA_STR_XIRCOM_CNW_801	"Xircom CreditCard Netwave (Canada)"
+#define	PCMCIA_CIS_XIRCOM_CNW_802	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_XIRCOM_CNW_802	0x0802
+#define	PCMCIA_STR_XIRCOM_CNW_802	"Xircom CreditCard Netwave (US)"
+#define	PCMCIA_CIS_XIRCOM_CT2	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_XIRCOM_CT2	0x1101
+#define	PCMCIA_STR_XIRCOM_CT2	"Xircom CreditCard Token Ring II"
+#define	PCMCIA_CIS_XIRCOM_CEM	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_XIRCOM_CEM	0x110a
+#define	PCMCIA_STR_XIRCOM_CEM	"Xircom CreditCard Ethernet + Modem"
+#define	PCMCIA_CIS_XIRCOM_REM56	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_XIRCOM_REM56	0x110a
+#define	PCMCIA_STR_XIRCOM_REM56	"Xircom RealPort Ethernet 10/100 + Modem 56"
+#define	PCMCIA_CIS_XIRCOM_CEM28	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_XIRCOM_CEM28	0x110b
+#define	PCMCIA_STR_XIRCOM_CEM28	"Xircom CreditCard Ethernet + Modem 28"
+#define	PCMCIA_CIS_XIRCOM_CEM33	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_XIRCOM_CEM33	0x110b
+#define	PCMCIA_STR_XIRCOM_CEM33	"Xircom CreditCard Ethernet + Modem 33"
+#define	PCMCIA_CIS_XIRCOM_CEM56	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_XIRCOM_CEM56	0x110b
+#define	PCMCIA_STR_XIRCOM_CEM56	"Xircom CreditCard Ethernet + Modem 56"
 
 /* ZONET */
-#define	PCCARD_CIS_ZONET_ZEN	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_ZONET_ZEN	0x0100
-#define	PCCARD_STR_ZONET_ZEN	"Zonet Zen 10/10"
+#define	PCMCIA_CIS_ZONET_ZEN	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_ZONET_ZEN	0x0100
+#define	PCMCIA_STR_ZONET_ZEN	"Zonet Zen 10/10"
 
 
 /*
  * Cards we know only by their cis, sorted by name.
  */
-#define	PCCARD_VENDOR_AMBICOM	-1	/* AmbiCom Inc */
-#define	PCCARD_VENDOR_ACCTON	-1	/* ACCTON */
-#define	PCCARD_VENDOR_AMD	-1	/* AMD */
-#define	PCCARD_VENDOR_BILLIONTON	-1	/* Billionton Systems Inc. */
-#define	PCCARD_VENDOR_CNET	-1	/* CNet */
-#define	PCCARD_VENDOR_DIGITAL	-1	/* Digital Equipment Corporation */
-#define	PCCARD_VENDOR_DLINK	-1	/* D-Link */
-#define	PCCARD_VENDOR_EIGERLABS	-1	/* Eiger labs,Inc. */
-#define	PCCARD_VENDOR_EPSON	-1	/* Seiko Epson Corporation */
-#define	PCCARD_VENDOR_EXP	-1	/* EXP Computer Inc */
-#define	PCCARD_VENDOR_ICOM	-1	/* ICOM Inc */
-#define	PCCARD_VENDOR_INTERSIL	-1	/* Intersil */
-#define	PCCARD_VENDOR_NAKAGAWAMETAL	-1	/* NAKAGAWA METAL */
-#define	PCCARD_VENDOR_PLANET	-1	/* Planet */
-#define	PCCARD_VENDOR_PLANEX	-1	/* Planex Communications Inc */
-#define	PCCARD_VENDOR_PREMAX	-1	/* Premax */
-#define	PCCARD_VENDOR_RPTI	-1	/* RPTI */
-#define	PCCARD_VENDOR_SVEC	-1	/* SVEC/Hawking Technology */
-#define	PCCARD_VENDOR_SYNERGY21	-1	/* Synergy 21 */
-#define	PCCARD_VENDOR_TEAC	-1	/* TEAC */
-#define	PCCARD_VENDOR_YEDATA	-1	/* Y-E DATA */
-
-#define	PCCARD_CIS_ACCTON_EN2212	{ "ACCTON", "EN2212", NULL, NULL }
-#define	PCCARD_PRODUCT_ACCTON_EN2212	-1
-#define	PCCARD_STR_ACCTON_EN2212	"Accton EN2212"
-#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_AMD_AM79C930	{ "AMD", "Am79C930", NULL, NULL }
-#define	PCCARD_PRODUCT_AMD_AM79C930	-1
-#define	PCCARD_STR_AMD_AM79C930	"AMD Am79C930"
-#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_CNET_NE2000	{ "CNet", "CN40BC Ethernet", "D", "NE2000" }
-#define	PCCARD_PRODUCT_CNET_NE2000	-1
-#define	PCCARD_STR_CNET_NE2000	"CNet CN40BC NE2000 Compatible"
-#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 Ether PCC-T"
-#define	PCCARD_CIS_COREGA_ETHER_PCC_TD	{ "corega K.K.", "corega Ether PCC-TD", NULL, NULL }
-#define	PCCARD_PRODUCT_COREGA_ETHER_PCC_TD	-1
-#define	PCCARD_STR_COREGA_ETHER_PCC_TD	"Corega Ether PCC-TD"
-#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 EtherII PCC-T"
-#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_FETHER_PCC_TXD	{ "corega K.K.", "corega FEther PCC-TXD", NULL, NULL }
-#define	PCCARD_PRODUCT_COREGA_FETHER_PCC_TXD	-1
-#define	PCCARD_STR_COREGA_FETHER_PCC_TXD	"Corega FEther PCC-TXD"
-#define	PCCARD_CIS_COREGA_FETHER_PCC_TXF	{ "corega", "FEther PCC-TXF", NULL, NULL }
-#define	PCCARD_PRODUCT_COREGA_FETHER_PCC_TXF	-1
-#define	PCCARD_STR_COREGA_FETHER_PCC_TXF	"Corega FEther PCC-TXF"
-#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_COREGA_WIRELESS_LAN_PCCA_11	{ "corega K.K.", "Wireless LAN PCCA-11", NULL, NULL }
-#define	PCCARD_PRODUCT_COREGA_WIRELESS_LAN_PCCA_11	-1
-#define	PCCARD_STR_COREGA_WIRELESS_LAN_PCCA_11	"Corega Wireless LAN PCCA-11"
-#define	PCCARD_CIS_COREGA_WIRELESS_LAN_PCCB_11	{ "corega_K.K.", "Wireless_LAN_PCCB-11", NULL, NULL }
-#define	PCCARD_PRODUCT_COREGA_WIRELESS_LAN_PCCB_11	-1
-#define	PCCARD_STR_COREGA_WIRELESS_LAN_PCCB_11	"Corega Wireless LAN PCCB-11"
-
-#define	PCCARD_CIS_DIGITAL_DEPCMXX	{ "DIGITAL", "DEPCM-XX", NULL, NULL }
-#define	PCCARD_PRODUCT_DIGITAL_DEPCMXX	-1
-#define	PCCARD_STR_DIGITAL_DEPCMXX	"DEC DEPCM-BA"
-#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"
-#define	PCCARD_CIS_DLINK_DE660	{ "D-Link", "DE-660", NULL, NULL }
-#define	PCCARD_PRODUCT_DLINK_DE660	-1
-#define	PCCARD_STR_DLINK_DE660	"D-Link DE-660"
-#define	PCCARD_CIS_DLINK_DE660PLUS	{ "D-Link", "DE-660+", NULL, NULL }
-#define	PCCARD_PRODUCT_DLINK_DE660PLUS	-1
-#define	PCCARD_STR_DLINK_DE660PLUS	"D-Link DE-660+"
+#define	PCMCIA_VENDOR_AMBICOM	-1	/* AmbiCom Inc */
+#define	PCMCIA_VENDOR_ACCTON	-1	/* ACCTON */
+#define	PCMCIA_VENDOR_AMD	-1	/* AMD */
+#define	PCMCIA_VENDOR_BILLIONTON	-1	/* Billionton Systems Inc. */
+#define	PCMCIA_VENDOR_CNET	-1	/* CNet */
+#define	PCMCIA_VENDOR_DIGITAL	-1	/* Digital Equipment Corporation */
+#define	PCMCIA_VENDOR_DLINK	-1	/* D-Link */
+#define	PCMCIA_VENDOR_EIGERLABS	-1	/* Eiger labs,Inc. */
+#define	PCMCIA_VENDOR_EPSON	-1	/* Seiko Epson Corporation */
+#define	PCMCIA_VENDOR_EXP	-1	/* EXP Computer Inc */
+#define	PCMCIA_VENDOR_ICOM	-1	/* ICOM Inc */
+#define	PCMCIA_VENDOR_INTERSIL	-1	/* Intersil */
+#define	PCMCIA_VENDOR_NAKAGAWAMETAL	-1	/* NAKAGAWA METAL */
+#define	PCMCIA_VENDOR_PLANET	-1	/* Planet */
+#define	PCMCIA_VENDOR_PLANEX	-1	/* Planex Communications Inc */
+#define	PCMCIA_VENDOR_PREMAX	-1	/* Premax */
+#define	PCMCIA_VENDOR_RPTI	-1	/* RPTI */
+#define	PCMCIA_VENDOR_SVEC	-1	/* SVEC/Hawking Technology */
+#define	PCMCIA_VENDOR_SYNERGY21	-1	/* Synergy 21 */
+#define	PCMCIA_VENDOR_TEAC	-1	/* TEAC */
+#define	PCMCIA_VENDOR_YEDATA	-1	/* Y-E DATA */
+
+#define	PCMCIA_CIS_ACCTON_EN2212	{ "ACCTON", "EN2212", NULL, NULL }
+#define	PCMCIA_PRODUCT_ACCTON_EN2212	-1
+#define	PCMCIA_STR_ACCTON_EN2212	"Accton EN2212"
+#define	PCMCIA_CIS_AMBICOM_AMB8002T	{ "AmbiCom Inc", "AMB8002T", NULL, NULL }
+#define	PCMCIA_PRODUCT_AMBICOM_AMB8002T	-1
+#define	PCMCIA_STR_AMBICOM_AMB8002T	"AmbiCom AMB8002T"
+#define	PCMCIA_CIS_AMD_AM79C930	{ "AMD", "Am79C930", NULL, NULL }
+#define	PCMCIA_PRODUCT_AMD_AM79C930	-1
+#define	PCMCIA_STR_AMD_AM79C930	"AMD Am79C930"
+#define	PCMCIA_CIS_BILLIONTON_LNT10TN	{ "PCMCIA", "LNT-10TN", NULL, NULL }
+#define	PCMCIA_PRODUCT_BILLIONTON_LNT10TN	-1
+#define	PCMCIA_STR_BILLIONTON_LNT10TN	"Billionton Systems Inc. LNT-10TN NE2000 Compatible Card"
+#define	PCMCIA_CIS_CNET_NE2000	{ "CNet", "CN40BC Ethernet", "D", "NE2000" }
+#define	PCMCIA_PRODUCT_CNET_NE2000	-1
+#define	PCMCIA_STR_CNET_NE2000	"CNet CN40BC NE2000 Compatible"
+#define	PCMCIA_CIS_COREGA_ETHER_PCC_T	{ "corega K.K.", "corega Ether PCC-T", NULL, NULL }
+#define	PCMCIA_PRODUCT_COREGA_ETHER_PCC_T	-1
+#define	PCMCIA_STR_COREGA_ETHER_PCC_T	"Corega Ether PCC-T"
+#define	PCMCIA_CIS_COREGA_ETHER_PCC_TD	{ "corega K.K.", "corega Ether PCC-TD", NULL, NULL }
+#define	PCMCIA_PRODUCT_COREGA_ETHER_PCC_TD	-1
+#define	PCMCIA_STR_COREGA_ETHER_PCC_TD	"Corega Ether PCC-TD"
+#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	-1
+#define	PCMCIA_STR_COREGA_ETHER_II_PCC_T	"Corega EtherII PCC-T"
+#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	-1
+#define	PCMCIA_STR_COREGA_FAST_ETHER_PCC_TX	"Corega FastEther PCC-TX"
+#define	PCMCIA_CIS_COREGA_FETHER_PCC_TXD	{ "corega K.K.", "corega FEther PCC-TXD", NULL, NULL }
+#define	PCMCIA_PRODUCT_COREGA_FETHER_PCC_TXD	-1
+#define	PCMCIA_STR_COREGA_FETHER_PCC_TXD	"Corega FEther PCC-TXD"
+#define	PCMCIA_CIS_COREGA_FETHER_PCC_TXF	{ "corega", "FEther PCC-TXF", NULL, NULL }
+#define	PCMCIA_PRODUCT_COREGA_FETHER_PCC_TXF	-1
+#define	PCMCIA_STR_COREGA_FETHER_PCC_TXF	"Corega FEther PCC-TXF"
+#define	PCMCIA_CIS_COREGA_WIRELESS_LAN_PCC_11	{ "corega K.K.", "Wireless LAN PCC-11", NULL, NULL }
+#define	PCMCIA_PRODUCT_COREGA_WIRELESS_LAN_PCC_11	-1
+#define	PCMCIA_STR_COREGA_WIRELESS_LAN_PCC_11	"Corega Wireless LAN PCC-11"
+#define	PCMCIA_CIS_COREGA_WIRELESS_LAN_PCCA_11	{ "corega K.K.", "Wireless LAN PCCA-11", NULL, NULL }
+#define	PCMCIA_PRODUCT_COREGA_WIRELESS_LAN_PCCA_11	-1
+#define	PCMCIA_STR_COREGA_WIRELESS_LAN_PCCA_11	"Corega Wireless LAN PCCA-11"
+#define	PCMCIA_CIS_COREGA_WIRELESS_LAN_PCCB_11	{ "corega_K.K.", "Wireless_LAN_PCCB-11", NULL, NULL }
+#define	PCMCIA_PRODUCT_COREGA_WIRELESS_LAN_PCCB_11	-1
+#define	PCMCIA_STR_COREGA_WIRELESS_LAN_PCCB_11	"Corega Wireless LAN PCCB-11"
+
+#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_DLINK_DE650	{ "D-Link", "DE-650", NULL, NULL }
+#define	PCMCIA_PRODUCT_DLINK_DE650	-1
+#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	-1
+#define	PCMCIA_STR_DLINK_DE660	"D-Link DE-660"
+#define	PCMCIA_CIS_DLINK_DE660PLUS	{ "D-Link", "DE-660+", NULL, NULL }
+#define	PCMCIA_PRODUCT_DLINK_DE660PLUS	-1
+#define	PCMCIA_STR_DLINK_DE660PLUS	"D-Link DE-660+"
 /*
  * vendor ID of EPX_AA2000 is Fujitsu (0x0004) and product ID is 0x2000, but
  * it conflicts with Fujitsu Towa LA501 Ethernet.
  */
-#define	PCCARD_CIS_EIGERLABS_EPX_AA2000	{ "Eiger labs,Inc.", "EPX-AA2000 PC Sound Card", NULL, NULL }
-#define	PCCARD_PRODUCT_EIGERLABS_EPX_AA2000	-1
-#define	PCCARD_STR_EIGERLABS_EPX_AA2000	"EPX-AA2000 PC Sound Card"
-#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"
-#define	PCCARD_CIS_EXP_EXPMULTIMEDIA	{ "EXP   ", "PnPIDE", "F1", NULL }
-#define	PCCARD_PRODUCT_EXP_EXPMULTIMEDIA	-1
-#define	PCCARD_STR_EXP_EXPMULTIMEDIA	"EXP IDE/ATAPI DVD Card"
-#define	PCCARD_CIS_GEMTEK_WLAN	{ "Intersil", "PRISM 2_5 PCMCIA ADAPTER", "ISL37300P", "Eval-RevA" }
-#define	PCCARD_PRODUCT_GEMTEK_WLAN	-1
-#define	PCCARD_STR_GEMTEK_WLAN	"GEMTEK Prism2_5 WaveLAN Card"
-#define	PCCARD_CIS_ICOM_SL200	{ "Icom", "SL-200", NULL, NULL }
-#define	PCCARD_PRODUCT_ICOM_SL200	-1
-#define	PCCARD_STR_ICOM_SL200	"Icom SL-200"
-#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"
-#define	PCCARD_CIS_IODATA_CBIDE2	{ "IO DATA", "CBIDE2      ", NULL, NULL }
-#define	PCCARD_PRODUCT_IODATA_CBIDE2	-1
-#define	PCCARD_STR_IODATA_CBIDE2	"IO-DATA CBIDE2/16-bit mode"
-#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_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_MEGAHERTZ_XJ2288	{ "MEGAHERTZ", "MODEM XJ2288", NULL, NULL }
-#define	PCCARD_PRODUCT_MEGAHERTZ_XJ2288	-1
-#define	PCCARD_STR_MEGAHERTZ_XJ2288	"Megahertz XJ2288 Modem"
-#define	PCCARD_CIS_MELCO_LPC2_TX	{ "MELCO", "LPC2-TX", NULL, NULL }
-#define	PCCARD_PRODUCT_MELCO_LPC2_TX	-1
-#define	PCCARD_STR_MELCO_LPC2_TX	"Melco LPC2-TX"
-#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_NANOSPEED_PRISM2	{ "NANOSPEED", "HFA384x/IEEE", "Version 01.02", NULL }
-#define	PCCARD_PRODUCT_NANOSPEED_PRISM2	-1
-#define	PCCARD_STR_NANOSPEED_PRISM2	"NANOSPEED ROOT-RZ2000 WLAN Card"
-#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_NEC_CMZ_RT_WP	{ "NEC", "Wireless Card CMZ-RT-WP", "Version 01.01", NULL }
-#define	PCCARD_PRODUCT_NEC_CMZ_RT_WP	-1
-#define	PCCARD_STR_NEC_CMZ_RT_WP	"NEC Wireless Card CMZ-RT-WP"
-#define	PCCARD_CIS_NTT_ME_WLAN	{ "NTT-ME", "11Mbps Wireless LAN PC Card", NULL, NULL }
-#define	PCCARD_PRODUCT_NTT_ME_WLAN	-1
-#define	PCCARD_STR_NTT_ME_WLAN	"NTT-ME 11Mbps Wireless LAN PC Card"
-#define	PCCARD_CIS_PLANET_SMARTCOM2000	{ "PCMCIA", "UE2212", NULL, NULL }
-#define	PCCARD_PRODUCT_PLANET_SMARTCOM2000	-1
-#define	PCCARD_STR_PLANET_SMARTCOM2000	"Planet SmartCOM 2000"
+#define	PCMCIA_CIS_EIGERLABS_EPX_AA2000	{ "Eiger labs,Inc.", "EPX-AA2000 PC Sound Card", NULL, NULL }
+#define	PCMCIA_PRODUCT_EIGERLABS_EPX_AA2000	-1
+#define	PCMCIA_STR_EIGERLABS_EPX_AA2000	"EPX-AA2000 PC Sound Card"
+#define	PCMCIA_CIS_EPSON_EEN10B	{ "Seiko Epson Corp.", "Ethernet", "P/N: EEN10B Rev. 00", NULL }
+#define	PCMCIA_PRODUCT_EPSON_EEN10B	-1
+#define	PCMCIA_STR_EPSON_EEN10B	"Epson EEN10B"
+#define	PCMCIA_CIS_EXP_EXPMULTIMEDIA	{ "EXP   ", "PnPIDE", "F1", NULL }
+#define	PCMCIA_PRODUCT_EXP_EXPMULTIMEDIA	-1
+#define	PCMCIA_STR_EXP_EXPMULTIMEDIA	"EXP IDE/ATAPI DVD Card"
+#define	PCMCIA_CIS_GEMTEK_WLAN	{ "Intersil", "PRISM 2_5 PCMCIA ADAPTER", "ISL37300P", "Eval-RevA" }
+#define	PCMCIA_PRODUCT_GEMTEK_WLAN	-1
+#define	PCMCIA_STR_GEMTEK_WLAN	"GEMTEK Prism2_5 WaveLAN Card"
+#define	PCMCIA_CIS_ICOM_SL200	{ "Icom", "SL-200", NULL, NULL }
+#define	PCMCIA_PRODUCT_ICOM_SL200	-1
+#define	PCMCIA_STR_ICOM_SL200	"Icom SL-200"
+#define	PCMCIA_CIS_INTERSIL_PRISM2	{ "INTERSIL", "HFA384x/IEEE", "Version 01.02", NULL }
+#define	PCMCIA_PRODUCT_INTERSIL_PRISM2	-1
+#define	PCMCIA_STR_INTERSIL_PRISM2	"Intersil Prism II"
+#define	PCMCIA_CIS_IODATA_CBIDE2	{ "IO DATA", "CBIDE2      ", NULL, NULL }
+#define	PCMCIA_PRODUCT_IODATA_CBIDE2	-1
+#define	PCMCIA_STR_IODATA_CBIDE2	"IO-DATA CBIDE2/16-bit mode"
+#define	PCMCIA_CIS_IODATA_PCLAT	{ "I-O DATA", "PCLA", "ETHERNET", NULL }
+#define	PCMCIA_PRODUCT_IODATA_PCLAT	-1
+#define	PCMCIA_STR_IODATA_PCLAT	"IO-DATA PCLA/T"
+#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"
+#define	PCMCIA_CIS_MEGAHERTZ_XJ2288	{ "MEGAHERTZ", "MODEM XJ2288", NULL, NULL }
+#define	PCMCIA_PRODUCT_MEGAHERTZ_XJ2288	-1
+#define	PCMCIA_STR_MEGAHERTZ_XJ2288	"Megahertz XJ2288 Modem"
+#define	PCMCIA_CIS_MELCO_LPC2_TX	{ "MELCO", "LPC2-TX", NULL, NULL }
+#define	PCMCIA_PRODUCT_MELCO_LPC2_TX	-1
+#define	PCMCIA_STR_MELCO_LPC2_TX	"Melco LPC2-TX"
+#define	PCMCIA_CIS_NAKAGAWAMETAL_LNT10TN	{ "PCMCIA", "LNT-10TN", NULL, NULL }
+#define	PCMCIA_PRODUCT_NAKAGAWAMETAL_LNT10TN	-1
+#define	PCMCIA_STR_NAKAGAWAMETAL_LNT10TN	"NAKAGAWA METAL LNT-10TN NE2000 Compatible Card"
+#define	PCMCIA_CIS_NANOSPEED_PRISM2	{ "NANOSPEED", "HFA384x/IEEE", "Version 01.02", NULL }
+#define	PCMCIA_PRODUCT_NANOSPEED_PRISM2	-1
+#define	PCMCIA_STR_NANOSPEED_PRISM2	"NANOSPEED ROOT-RZ2000 WLAN Card"
+#define	PCMCIA_CIS_NDC_ND5100_E	{ "NDC", "Ethernet", "A", NULL }
+#define	PCMCIA_PRODUCT_NDC_ND5100_E	-1
+#define	PCMCIA_STR_NDC_ND5100_E	"Sohoware ND5100E NE2000 Compatible Card"
+#define	PCMCIA_CIS_NEC_CMZ_RT_WP	{ "NEC", "Wireless Card CMZ-RT-WP", "Version 01.01", NULL }
+#define	PCMCIA_PRODUCT_NEC_CMZ_RT_WP	-1
+#define	PCMCIA_STR_NEC_CMZ_RT_WP	"NEC Wireless Card CMZ-RT-WP"
+#define	PCMCIA_CIS_NTT_ME_WLAN	{ "NTT-ME", "11Mbps Wireless LAN PC Card", NULL, NULL }
+#define	PCMCIA_PRODUCT_NTT_ME_WLAN	-1
+#define	PCMCIA_STR_NTT_ME_WLAN	"NTT-ME 11Mbps Wireless LAN PC Card"
+#define	PCMCIA_CIS_PLANET_SMARTCOM2000	{ "PCMCIA", "UE2212", NULL, NULL }
+#define	PCMCIA_PRODUCT_PLANET_SMARTCOM2000	-1
+#define	PCMCIA_STR_PLANET_SMARTCOM2000	"Planet SmartCOM 2000"
 /*
  * vendor ID of both FNW-3600-T and FNW-3700-T is LINKSYS (0x0149) and
  * product ID is 0xc1ab, but it conflicts with LINKSYS Combo EthernetCard.
  */
-#define	PCCARD_CIS_PLANEX_FNW3600T	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_PLANEX_FNW3600T	-1
-#define	PCCARD_STR_PLANEX_FNW3600T	"Planex FNW-3600-T"
-#define	PCCARD_CIS_PLANEX_FNW3700T	{ NULL, NULL, NULL, NULL }
-#define	PCCARD_PRODUCT_PLANEX_FNW3700T	-1
-#define	PCCARD_STR_PLANEX_FNW3700T	"Planex FNW-3700-T"
-#define	PCCARD_CIS_RPTI_EP400	{ "RPTI LTD.", "EP400", "CISV100", NULL }
-#define	PCCARD_PRODUCT_RPTI_EP400	-1
-#define	PCCARD_STR_RPTI_EP400	"RPTI EP400"
-#define	PCCARD_CIS_RPTI_EP401	{ "RPTI", "EP401 Ethernet NE2000 Compatible", NULL, NULL }
-#define	PCCARD_PRODUCT_RPTI_EP401	-1
-#define	PCCARD_STR_RPTI_EP401	"RPTI EP401"
-#define	PCCARD_CIS_PREMAX_PE200	{ "PMX   ", "PE-200", NULL, NULL }
-#define	PCCARD_PRODUCT_PREMAX_PE200	-1
-#define	PCCARD_STR_PREMAX_PE200	"PreMax PE-200"
-#define	PCCARD_CIS_SMC_2632W	{ "SMC", "SMC2632W", "Version 01.02", NULL }
-#define	PCCARD_PRODUCT_SMC_2632W	-1
-#define	PCCARD_STR_SMC_2632W	"SMC 2632 EZ Connect Wireless PC Card"
-#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"
-#define	PCCARD_CIS_SVEC_LANCARD	{ "SVEC", "FD605 PCMCIA EtherNet Card", "V1-1", NULL }
-#define	PCCARD_PRODUCT_SVEC_LANCARD	-1
-#define	PCCARD_STR_SVEC_LANCARD	"SVEC PCMCIA Lan Card"
+#define	PCMCIA_CIS_PLANEX_FNW3600T	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_PLANEX_FNW3600T	-1
+#define	PCMCIA_STR_PLANEX_FNW3600T	"Planex FNW-3600-T"
+#define	PCMCIA_CIS_PLANEX_FNW3700T	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_PLANEX_FNW3700T	-1
+#define	PCMCIA_STR_PLANEX_FNW3700T	"Planex FNW-3700-T"
+#define	PCMCIA_CIS_RPTI_EP400	{ "RPTI LTD.", "EP400", "CISV100", NULL }
+#define	PCMCIA_PRODUCT_RPTI_EP400	-1
+#define	PCMCIA_STR_RPTI_EP400	"RPTI EP400"
+#define	PCMCIA_CIS_RPTI_EP401	{ "RPTI", "EP401 Ethernet NE2000 Compatible", NULL, NULL }
+#define	PCMCIA_PRODUCT_RPTI_EP401	-1
+#define	PCMCIA_STR_RPTI_EP401	"RPTI EP401"
+#define	PCMCIA_CIS_PREMAX_PE200	{ "PMX   ", "PE-200", NULL, NULL }
+#define	PCMCIA_PRODUCT_PREMAX_PE200	-1
+#define	PCMCIA_STR_PREMAX_PE200	"PreMax PE-200"
+#define	PCMCIA_CIS_SMC_2632W	{ "SMC", "SMC2632W", "Version 01.02", NULL }
+#define	PCMCIA_PRODUCT_SMC_2632W	-1
+#define	PCMCIA_STR_SMC_2632W	"SMC 2632 EZ Connect Wireless PC Card"
+#define	PCMCIA_CIS_SVEC_COMBOCARD	{ "Ethernet", "Adapter", NULL, NULL }
+#define	PCMCIA_PRODUCT_SVEC_COMBOCARD	-1
+#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	-1
+#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	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_SYNERGY21_S21810	{ "PCMCIA", "Ethernet", "A", "004743118001" }
-#define	PCCARD_PRODUCT_SYNERGY21_S21810	-1
-#define	PCCARD_STR_SYNERGY21_S21810	"Synergy 21 S21810+ NE2000 Compatible Card"
-#define	PCCARD_CIS_TEAC_IDECARDII	{ NULL, "NinjaATA-", NULL, NULL }
-#define	PCCARD_PRODUCT_TEAC_IDECARDII	-1
-#define	PCCARD_STR_TEAC_IDECARDII	"TEAC IDE Card/II"
-#define	PCCARD_CIS_XIRCOM_CFE_10	{ "Xircom", "CompactCard Ethernet", "CFE-10", "1.00" }
-#define	PCCARD_PRODUCT_XIRCOM_CFE_10	-1
-#define	PCCARD_STR_XIRCOM_CFE_10	"Xircom CompactCard CFE-10"
-#define	PCCARD_CIS_YEDATA_EXTERNAL_FDD	{ "Y-E DATA", "External FDD", NULL, NULL }
-#define	PCCARD_PRODUCT_YEDATA_EXTERNAL_FDD	-1
-#define	PCCARD_STR_YEDATA_EXTERNAL_FDD	"Y-E DATA External FDD"
-
-#define	PCCARD_CIS_ZOOM_AIR_4000	{ "Zoom", "Air-4000", NULL, NULL }
-#define	PCCARD_PRODUCT_ZOOM_AIR_4000	-1
-#define	PCCARD_STR_ZOOM_AIR_4000	"Zoom Air-4000"
+#define	PCMCIA_CIS_SVEC_PN650TX	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_SVEC_PN650TX	-1
+#define	PCMCIA_STR_SVEC_PN650TX	"SVEC PN650TX 10/100 Dual Speed Fast Ethernet PC Card"
+#define	PCMCIA_CIS_SYNERGY21_S21810	{ "PCMCIA", "Ethernet", "A", "004743118001" }
+#define	PCMCIA_PRODUCT_SYNERGY21_S21810	-1
+#define	PCMCIA_STR_SYNERGY21_S21810	"Synergy 21 S21810+ NE2000 Compatible Card"
+#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_XIRCOM_CFE_10	{ "Xircom", "CompactCard Ethernet", "CFE-10", "1.00" }
+#define	PCMCIA_PRODUCT_XIRCOM_CFE_10	-1
+#define	PCMCIA_STR_XIRCOM_CFE_10	"Xircom CompactCard CFE-10"
+#define	PCMCIA_CIS_YEDATA_EXTERNAL_FDD	{ "Y-E DATA", "External FDD", NULL, NULL }
+#define	PCMCIA_PRODUCT_YEDATA_EXTERNAL_FDD	-1
+#define	PCMCIA_STR_YEDATA_EXTERNAL_FDD	"Y-E DATA External FDD"
+
+#define	PCMCIA_CIS_ZOOM_AIR_4000	{ "Zoom", "Air-4000", NULL, NULL }
+#define	PCMCIA_PRODUCT_ZOOM_AIR_4000	-1
+#define	PCMCIA_STR_ZOOM_AIR_4000	"Zoom Air-4000"
diff --git a/sys/dev/pccard/pccardvar.h b/sys/dev/pccard/pccardvar.h
index a2486ff..e75fe3a 100644
--- a/sys/dev/pccard/pccardvar.h
+++ b/sys/dev/pccard/pccardvar.h
@@ -176,11 +176,11 @@ struct pccard_card {
 	 * indicates no id was found.
 	 */
 	int32_t		manufacturer;
-#define	PCCARD_VENDOR_INVALID	-1
+#define	PCMCIA_VENDOR_INVALID	-1
 	int32_t		product;
-#define	PCCARD_PRODUCT_INVALID		-1
+#define	PCMCIA_PRODUCT_INVALID		-1
 	u_int16_t	error;
-#define	PCCARD_CIS_INVALID		{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_CIS_INVALID		{ NULL, NULL, NULL, NULL }
 	STAILQ_HEAD(, pccard_function) pf_head;
 };