Eliminate unused argument in PCMCIA_CARD macro.

Provide a backwards compatible way to have the extra macro by defining
PCCARD_API_LEVEL 5 before including pccarddevs for driver writers that
want/need to have the same driver on 5 and 6 with pccard attachments.

Approved by: re (dwhite)

1 files changed, 51 insertions, 49 deletions

diff --git a/sys/dev/wi/if_wi_pccard.c b/sys/dev/wi/if_wi_pccard.c
index e4bac8d..72d15c7 100644
--- a/sys/dev/wi/if_wi_pccard.c
+++ b/sys/dev/wi/if_wi_pccard.c
@@ -64,6 +64,7 @@ __FBSDID("$FreeBSD$");
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_radiotap.h>
 
+#define PCCARD_API_LEVEL 6
 #include <dev/pccard/pccardvar.h>
 #include <dev/pccard/pccard_cis.h>
 
@@ -107,55 +108,56 @@ DRIVER_MODULE(wi, pccard, wi_pccard_driver, wi_devclass, 0, 0);
 MODULE_DEPEND(wi, wlan, 1, 1, 1);
 
 static const struct pccard_product wi_pccard_products[] = {
-	PCMCIA_CARD(3COM, 3CRWE737A, 0),
-	PCMCIA_CARD(3COM, 3CRWE777A, 0),
-	PCMCIA_CARD(ACTIONTEC, PRISM, 0),
-	PCMCIA_CARD(ADDTRON, AWP100, 0),
-	PCMCIA_CARD(AIRVAST, WN_100, 0),
-	PCMCIA_CARD(ALLIEDTELESIS, WR211PCM, 0),
-	PCMCIA_CARD(ARTEM, ONAIR, 0),
- 	PCMCIA_CARD(ASUS, WL100, 0),
-	PCMCIA_CARD(BAY, EMOBILITY_11B, 0),
-	PCMCIA_CARD(BROMAX, IWN, 0),
-	PCMCIA_CARD(BROMAX, IWN3, 0),
-	PCMCIA_CARD(BROMAX, WCF11, 0),
-	PCMCIA_CARD(BUFFALO, WLI_CF_S11G, 0),
-	PCMCIA_CARD(BUFFALO, WLI_PCM_S11, 0),
-	PCMCIA_CARD(COMPAQ, NC5004, 0),
-	PCMCIA_CARD(CONTEC, FX_DS110_PCC, 0),
-	PCMCIA_CARD(COREGA, WIRELESS_LAN_PCC_11, 0),
-	PCMCIA_CARD(COREGA, WIRELESS_LAN_PCCA_11, 0),
-	PCMCIA_CARD(COREGA, WIRELESS_LAN_PCCB_11, 0),
-	PCMCIA_CARD(COREGA, WIRELESS_LAN_PCCL_11, 0),
-	PCMCIA_CARD(DLINK, DWL650H, 0),
-	PCMCIA_CARD(ELSA, XI300_IEEE, 0),
-	PCMCIA_CARD(ELSA, XI325_IEEE, 0),
-	PCMCIA_CARD(ELSA, XI800_IEEE, 0),
-	PCMCIA_CARD(EMTAC, WLAN, 0),
-	PCMCIA_CARD(ERICSSON, WIRELESSLAN, 0),
-	PCMCIA_CARD(GEMTEK, WLAN, 0),
-	PCMCIA_CARD(HWN, AIRWAY80211, 0), 
-	PCMCIA_CARD(INTEL, PRO_WLAN_2011, 0),
-	PCMCIA_CARD(INTERSIL, ISL37100P, 0),
-	PCMCIA_CARD(INTERSIL, ISL37110P, 0),
-	PCMCIA_CARD(INTERSIL, ISL37300P, 0),
-	PCMCIA_CARD(INTERSIL2, PRISM2, 0),
-	PCMCIA_CARD(IODATA2, WCF12, 0),
-	PCMCIA_CARD(IODATA2, WNB11PCM, 0),
-	PCMCIA_CARD(FUJITSU, WL110, 0),
-	PCMCIA_CARD(LUCENT, WAVELAN_IEEE, 0),
-	PCMCIA_CARD(MICROSOFT, MN_520, 0),
-	PCMCIA_CARD(NOKIA, C020_WLAN, 0),
-	PCMCIA_CARD(NOKIA, C110_WLAN, 0),
-	PCMCIA_CARD(PLANEX, GWNS11H, 0),
-	PCMCIA_CARD(PROXIM, HARMONY, 0),
-	PCMCIA_CARD(PROXIM, RANGELANDS_8430, 0),
-	PCMCIA_CARD(SAMSUNG, SWL_2000N, 0),
-	PCMCIA_CARD(SIEMENS, SS1021, 0),
-	PCMCIA_CARD(SIMPLETECH, SPECTRUM24_ALT, 0),
-	PCMCIA_CARD(SOCKET, LP_WLAN_CF, 0),
-	PCMCIA_CARD(SYMBOL, LA4100, 0),
-	PCMCIA_CARD(TDK, LAK_CD011WL, 0),
+	PCMCIA_CARD(3COM, 3CRWE737A),
+	PCMCIA_CARD(3COM, 3CRWE777A),
+	PCMCIA_CARD(ACTIONTEC, PRISM),
+	PCMCIA_CARD(ADDTRON, AWP100),
+	PCMCIA_CARD(AIRVAST, WN_100),
+	PCMCIA_CARD(ALLIEDTELESIS, WR211PCM),
+	PCMCIA_CARD(ARTEM, ONAIR),
+ 	PCMCIA_CARD(ASUS, WL100),
+	PCMCIA_CARD(BAY, EMOBILITY_11B),
+	PCMCIA_CARD(BROMAX, IWN),
+	PCMCIA_CARD(BROMAX, IWN3),
+	PCMCIA_CARD(BROMAX, WCF11),
+	PCMCIA_CARD(BUFFALO, WLI_CF_S11G),
+	PCMCIA_CARD(BUFFALO, WLI_PCM_S11),
+	PCMCIA_CARD(COMPAQ, NC5004),
+	PCMCIA_CARD(CONTEC, FX_DS110_PCC),
+	PCMCIA_CARD(COREGA, WIRELESS_LAN_PCC_11),
+	PCMCIA_CARD(COREGA, WIRELESS_LAN_PCCA_11),
+	PCMCIA_CARD(COREGA, WIRELESS_LAN_PCCB_11),
+	PCMCIA_CARD(COREGA, WIRELESS_LAN_PCCL_11),
+	PCMCIA_CARD(DLINK, DWL650H),
+	PCMCIA_CARD(ELSA, XI300_IEEE),
+	PCMCIA_CARD(ELSA, XI325_IEEE),
+	PCMCIA_CARD(ELSA, XI800_IEEE),
+	PCMCIA_CARD(ELSA, WIFI_FLASH),
+	PCMCIA_CARD(EMTAC, WLAN),
+	PCMCIA_CARD(ERICSSON, WIRELESSLAN),
+	PCMCIA_CARD(GEMTEK, WLAN),
+	PCMCIA_CARD(HWN, AIRWAY80211),
+	PCMCIA_CARD(INTEL, PRO_WLAN_2011),
+	PCMCIA_CARD(INTERSIL, ISL37100P),
+	PCMCIA_CARD(INTERSIL, ISL37110P),
+	PCMCIA_CARD(INTERSIL, ISL37300P),
+	PCMCIA_CARD(INTERSIL2, PRISM2),
+	PCMCIA_CARD(IODATA2, WCF12),
+	PCMCIA_CARD(IODATA2, WNB11PCM),
+	PCMCIA_CARD(FUJITSU, WL110),
+	PCMCIA_CARD(LUCENT, WAVELAN_IEEE),
+	PCMCIA_CARD(MICROSOFT, MN_520),
+	PCMCIA_CARD(NOKIA, C020_WLAN),
+	PCMCIA_CARD(NOKIA, C110_WLAN),
+	PCMCIA_CARD(PLANEX, GWNS11H),
+	PCMCIA_CARD(PROXIM, HARMONY),
+	PCMCIA_CARD(PROXIM, RANGELANDS_8430),
+	PCMCIA_CARD(SAMSUNG, SWL_2000N),
+	PCMCIA_CARD(SIEMENS, SS1021),
+	PCMCIA_CARD(SIMPLETECH, SPECTRUM24_ALT),
+	PCMCIA_CARD(SOCKET, LP_WLAN_CF),
+	PCMCIA_CARD(SYMBOL, LA4100),
+	PCMCIA_CARD(TDK, LAK_CD011WL),
 	{ NULL }
 };