Use PCCARD_CIS_xxx #defines for the table of oem ids. These usually

translate to all NULLs (as for all the ones in this commit).

3 files changed, 22 insertions, 16 deletions

diff --git a/sys/dev/aic/aic_pccard.c b/sys/dev/aic/aic_pccard.c
index 104a86d..fd4ca9e 100644
--- a/sys/dev/aic/aic_pccard.c
+++ b/sys/dev/aic/aic_pccard.c
@@ -57,14 +57,14 @@ static int aic_pccard_attach(device_t);
 
 const struct pccard_product aic_pccard_products[] = {
 	{ PCCARD_STR_ADAPTEC_APA1460,		PCCARD_VENDOR_ADAPTEC,
-	  PCCARD_PRODUCT_ADAPTEC_APA1460,	0, NULL, NULL },
-
+	  PCCARD_PRODUCT_ADAPTEC_APA1460,	0,
+	  PCCARD_CIS_ADAPTEC_APA1460 },
 	{ PCCARD_STR_ADAPTEC_APA1460A,		PCCARD_VENDOR_ADAPTEC,
-	  PCCARD_PRODUCT_ADAPTEC_APA1460A,	0, NULL, NULL },
-
+	  PCCARD_PRODUCT_ADAPTEC_APA1460A,	0,
+	  PCCARD_CIS_ADAPTEC_APA1460A },
 	{ PCCARD_STR_NEWMEDIA_BUSTOASTER,	PCCARD_VENDOR_NEWMEDIA,
-	  PCCARD_PRODUCT_NEWMEDIA_BUSTOASTER,	0, NULL, NULL },
-
+	  PCCARD_PRODUCT_NEWMEDIA_BUSTOASTER,	0,
+	  PCCARD_CIS_NEWMEDIA_BUSTOASTER },
 	{ NULL }
 };
 
diff --git a/sys/dev/ep/if_ep_pccard.c b/sys/dev/ep/if_ep_pccard.c
index c22010b..bc541b7 100644
--- a/sys/dev/ep/if_ep_pccard.c
+++ b/sys/dev/ep/if_ep_pccard.c
@@ -242,15 +242,20 @@ ep_pccard_detach(device_t dev)
 
 static const struct pccard_product ep_pccard_products[] = {
 	{ PCCARD_STR_3COM_3C574,		PCCARD_VENDOR_3COM,
-	  PCCARD_PRODUCT_3COM_3C574,		0, NULL, NULL },
+	  PCCARD_PRODUCT_3COM_3C574,		0,
+	  PCCARD_CIS_3COM_3C574 },
 	{ PCCARD_STR_3COM_3C589,		PCCARD_VENDOR_3COM,
-	  PCCARD_PRODUCT_3COM_3C589,		0, NULL, NULL },
+	  PCCARD_PRODUCT_3COM_3C589,		0,
+	  PCCARD_CIS_3COM_3C589 },
 	{ PCCARD_STR_3COM_3CXEM556,		PCCARD_VENDOR_3COM,
-	  PCCARD_PRODUCT_3COM_3CXEM556,		0, NULL, NULL },
+	  PCCARD_PRODUCT_3COM_3CXEM556,		0,
+	  PCCARD_CIS_3COM_3CXEM556 },
 	{ PCCARD_STR_3COM_3CXEM556INT,		PCCARD_VENDOR_3COM,
-	  PCCARD_PRODUCT_3COM_3CXEM556INT,	0, NULL, NULL },
+	  PCCARD_PRODUCT_3COM_3CXEM556INT,	0,
+	  PCCARD_CIS_3COM_3CXEM556INT },
 	{ PCCARD_STR_3COM_3CCFEM556BI,		PCCARD_VENDOR_3COM,
-	  PCCARD_PRODUCT_3COM_3CCFEM556BI,	0, NULL, NULL },
+	  PCCARD_PRODUCT_3COM_3CCFEM556BI,	0,
+	  PCCARD_CIS_3COM_3CCFEM556BI },
 	{ NULL }
 };
 
diff --git a/sys/dev/sn/if_sn_pccard.c b/sys/dev/sn/if_sn_pccard.c
index bb005ae..1b76e39 100644
--- a/sys/dev/sn/if_sn_pccard.c
+++ b/sys/dev/sn/if_sn_pccard.c
@@ -47,22 +47,23 @@
 #include <net/if.h> 
 #include <net/if_arp.h>
 
-
 #include <dev/sn/if_snvar.h>
 #include <dev/pccard/pccardvar.h>
-
 #include <dev/pccard/pccarddevs.h>
 
 #include "card_if.h"
 
 static const struct pccard_product sn_pccard_products[] = {
 	{ PCCARD_STR_MEGAHERTZ2_XJACK,		PCCARD_VENDOR_MEGAHERTZ2,
-	  PCCARD_PRODUCT_MEGAHERTZ2_XJACK,	 0, NULL, NULL },
+	  PCCARD_PRODUCT_MEGAHERTZ2_XJACK,	 0,
+	  PCCARD_CIS_MEGAHERTZ2_XJACK },
 	{ PCCARD_STR_NEWMEDIA_BASICS,		PCCARD_VENDOR_NEWMEDIA,
-	  PCCARD_PRODUCT_NEWMEDIA_BASICS,	0, NULL, NULL },
+	  PCCARD_PRODUCT_NEWMEDIA_BASICS,	0,
+	  PCCARD_CIS_NEWMEDIA_BASICS },
 #if 0
 	{ PCCARD_STR_SMC_8020BT,		PCCARD_VENDOR_SMC,
-	  PCCARD_PRODUCT_SMC_8020BT,		0, NULL, NULL},
+	  PCCARD_PRODUCT_SMC_8020BT,		0,
+	  PCCARD_CIS_SMC_8020BT },
 #endif
 	{ NULL }
 };