Sync to 1.46

1 files changed, 122 insertions, 114 deletions

diff --git a/sys/dev/pccard/pccarddevs.h b/sys/dev/pccard/pccarddevs.h
index 230b668..e12a639 100644
--- a/sys/dev/pccard/pccarddevs.h
+++ b/sys/dev/pccard/pccarddevs.h
@@ -4,9 +4,9 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.45 2003/03/18 02:36:54 imp Exp 
+ *	FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.46 2003/04/10 06:58:40 imp Exp 
  */
-/* $NetBSD: pcmciadevs,v 1.177 2002/09/15 17:43:48 bouyer Exp $ */
+/* $NetBSD: pcmciadevs,v 1.182 2003/04/09 02:09:55 christos Exp $ */
 /* $OpenBSD: pcmciadevs,v 1.93 2002/06/21 08:31:10 henning Exp $ */
 
 /*-
@@ -744,215 +744,220 @@
 /*
  * Cards we know only by their cis, sorted by name.
  */
-#define	PCMCIA_VENDOR_AMBICOM	-1	/* AmbiCom Inc */
-#define	PCMCIA_VENDOR_ACCTON	-1	/* ACCTON */
-#define	PCMCIA_VENDOR_ADDTRON	-1	/* Addtron */
-#define	PCMCIA_VENDOR_ARGOSY	-1	/* ARGOSY */
-#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_DYNALINK	-1	/* DynaLink */
-#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_FUTUREDOMAIN	-1	/* FutureDomain */
-#define	PCMCIA_VENDOR_GEMTEK	-1	/* Gem Tek */
-#define	PCMCIA_VENDOR_ICOM	-1	/* ICOM Inc */
-#define	PCMCIA_VENDOR_INTERSIL	-1	/* Intersil */
-#define	PCMCIA_VENDOR_IODATA3	-1	/* I-O DATA */
-#define	PCMCIA_VENDOR_LANTECH	-1	/* Lantech Computer Company */
-#define	PCMCIA_VENDOR_NAKAGAWAMETAL	-1	/* NAKAGAWA METAL */
-#define	PCMCIA_VENDOR_NDC	-1	/* NDC */
-#define	PCMCIA_VENDOR_NEC	-1	/* NEC */
-#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_WORKBIT2	-1	/* WORKBIT */
-#define	PCMCIA_VENDOR_YEDATA	-1	/* Y-E DATA */
-#define	PCMCIA_VENDOR_YIS	-1	/* YIS Corporation */
-#define	PCMCIA_VENDOR_ZOOM	-1	/* ZOOM */
+#define	PCMCIA_VENDOR_AMBICOM	0xffffffff	/* AmbiCom Inc */
+#define	PCMCIA_VENDOR_ACCTON	0xffffffff	/* ACCTON */
+#define	PCMCIA_VENDOR_ADDTRON	0xffffffff	/* Addtron */
+#define	PCMCIA_VENDOR_ARGOSY	0xffffffff	/* ARGOSY */
+#define	PCMCIA_VENDOR_AMD	0xffffffff	/* AMD */
+#define	PCMCIA_VENDOR_BILLIONTON	0xffffffff	/* Billionton Systems Inc. */
+#define	PCMCIA_VENDOR_CNET	0xffffffff	/* CNet */
+#define	PCMCIA_VENDOR_DIGITAL	0xffffffff	/* Digital Equipment Corporation */
+#define	PCMCIA_VENDOR_DLINK	0xffffffff	/* D-Link */
+#define	PCMCIA_VENDOR_DYNALINK	0xffffffff	/* DynaLink */
+#define	PCMCIA_VENDOR_EIGERLABS	0xffffffff	/* Eiger labs,Inc. */
+#define	PCMCIA_VENDOR_EPSON	0xffffffff	/* Seiko Epson Corporation */
+#define	PCMCIA_VENDOR_EXP	0xffffffff	/* EXP Computer Inc */
+#define	PCMCIA_VENDOR_FUTUREDOMAIN	0xffffffff	/* FutureDomain */
+#define	PCMCIA_VENDOR_GEMTEK	0xffffffff	/* Gem Tek */
+#define	PCMCIA_VENDOR_ICOM	0xffffffff	/* ICOM Inc */
+#define	PCMCIA_VENDOR_INTERSIL	0xffffffff	/* Intersil */
+#define	PCMCIA_VENDOR_IODATA3	0xffffffff	/* I-O DATA */
+#define	PCMCIA_VENDOR_LANTECH	0xffffffff	/* Lantech Computer Company */
+#define	PCMCIA_VENDOR_NAKAGAWAMETAL	0xffffffff	/* NAKAGAWA METAL */
+#define	PCMCIA_VENDOR_NDC	0xffffffff	/* NDC */
+#define	PCMCIA_VENDOR_NEC	0xffffffff	/* NEC */
+#define	PCMCIA_VENDOR_PLANET	0xffffffff	/* Planet */
+#define	PCMCIA_VENDOR_PLANEX	0xffffffff	/* Planex Communications Inc */
+#define	PCMCIA_VENDOR_PREMAX	0xffffffff	/* Premax */
+#define	PCMCIA_VENDOR_RPTI	0xffffffff	/* RPTI */
+#define	PCMCIA_VENDOR_SVEC	0xffffffff	/* SVEC/Hawking Technology */
+#define	PCMCIA_VENDOR_SYNERGY21	0xffffffff	/* Synergy 21 */
+#define	PCMCIA_VENDOR_TEAC	0xffffffff	/* TEAC */
+#define	PCMCIA_VENDOR_TOSHIBA	0xffffffff	/* TOSHIBA */
+#define	PCMCIA_VENDOR_WORKBIT2	0xffffffff	/* WORKBIT */
+#define	PCMCIA_VENDOR_YEDATA	0xffffffff	/* Y-E DATA */
+#define	PCMCIA_VENDOR_YIS	0xffffffff	/* YIS Corporation */
+#define	PCMCIA_VENDOR_ZOOM	0xffffffff	/* ZOOM */
 
 #define	PCMCIA_CIS_ACCTON_EN2212	{ "ACCTON", "EN2212", NULL, NULL }
-#define	PCMCIA_PRODUCT_ACCTON_EN2212	-1
+#define	PCMCIA_PRODUCT_ACCTON_EN2212	0xffffffff
 #define	PCMCIA_STR_ACCTON_EN2212	"Accton EN2212"
 #define	PCMCIA_CIS_ACCTON_EN2216	{ "ACCTON", "EN2216-PCMCIA-ETHERNET", "EN2216R01", NULL }
-#define	PCMCIA_PRODUCT_ACCTON_EN2216	-1
+#define	PCMCIA_PRODUCT_ACCTON_EN2216	0xffffffff
 #define	PCMCIA_STR_ACCTON_EN2216	"Accton EN2216"
 #define	PCMCIA_CIS_ACCTON_EN2226	{ "Accton", "Fast EtherCard-16", "EN2226", "1.00" }
-#define	PCMCIA_PRODUCT_ACCTON_EN2226	-1
+#define	PCMCIA_PRODUCT_ACCTON_EN2226	0xffffffff
 #define	PCMCIA_STR_ACCTON_EN2226	"Accton EN2226"
 #define	PCMCIA_CIS_ADDTRON_AWP100	{ "Addtron", "AWP-100 Wireless PCMCIA", "Version 01.02", NULL }
-#define	PCMCIA_PRODUCT_ADDTRON_AWP100	-1
+#define	PCMCIA_PRODUCT_ADDTRON_AWP100	0xffffffff
 #define	PCMCIA_STR_ADDTRON_AWP100	""
 #define	PCMCIA_CIS_ALLIEDTELESIS_WR211PCM	{ "Allied Telesis K.K.", "WR211PCM", NULL, NULL }
-#define	PCMCIA_PRODUCT_ALLIEDTELESIS_WR211PCM	-1
+#define	PCMCIA_PRODUCT_ALLIEDTELESIS_WR211PCM	0xffffffff
 #define	PCMCIA_STR_ALLIEDTELESIS_WR211PCM	"Allied Telesis WR211PCM"
 #define	PCMCIA_CIS_AMBICOM_AMB8002T	{ "AmbiCom Inc", "AMB8002T", NULL, NULL }
-#define	PCMCIA_PRODUCT_AMBICOM_AMB8002T	-1
+#define	PCMCIA_PRODUCT_AMBICOM_AMB8002T	0xffffffff
 #define	PCMCIA_STR_AMBICOM_AMB8002T	"AmbiCom AMB8002T"
 #define	PCMCIA_CIS_AMD_AM79C930	{ "AMD", "Am79C930", NULL, NULL }
-#define	PCMCIA_PRODUCT_AMD_AM79C930	-1
+#define	PCMCIA_PRODUCT_AMD_AM79C930	0xffffffff
 #define	PCMCIA_STR_AMD_AM79C930	"AMD Am79C930"
 #define	PCMCIA_CIS_ARGOSY_SP320	{ "PCMCIA", "RS-COM 2P", NULL, NULL
-#define	PCMCIA_PRODUCT_ARGOSY_SP320	-1
+#define	PCMCIA_PRODUCT_ARGOSY_SP320	0xffffffff
 #define	PCMCIA_STR_ARGOSY_SP320	"} ARGOSY SP320 Dual port serial PCMCIA"
+#define	PCMCIA_CIS_BILLIONTON_CFLT10N	{ "CF", "10Base-Ethernet", "1.0", NULL }
+#define	PCMCIA_PRODUCT_BILLIONTON_CFLT10N	0xffffffff
+#define	PCMCIA_STR_BILLIONTON_CFLT10N	"Billionton Systems Inc. CFLT10N Ethernet"
 #define	PCMCIA_CIS_BILLIONTON_LNT10TN	{ "PCMCIA", "LNT-10TN", NULL, NULL }
-#define	PCMCIA_PRODUCT_BILLIONTON_LNT10TN	-1
+#define	PCMCIA_PRODUCT_BILLIONTON_LNT10TN	0xffffffff
 #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"
++product BILLIONTON CFLT10N     { "CF", "10Base-Ethernet", "1.0", NULL } Billionproduct CNET NE2000		{ "CNet", "CN40BC&spEthernet", "D", "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_PRODUCT_COREGA_ETHER_PCC_T	0xffffffff
 #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_PRODUCT_COREGA_ETHER_PCC_TD	0xffffffff
 #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_PRODUCT_COREGA_ETHER_II_PCC_T	0xffffffff
 #define	PCMCIA_STR_COREGA_ETHER_II_PCC_T	"Corega EtherII PCC-T"
 #define	PCMCIA_CIS_COREGA_ETHER_II_PCC_TD	{ "corega K.K.", "corega EtherII PCC-TD", NULL, NULL }
-#define	PCMCIA_PRODUCT_COREGA_ETHER_II_PCC_TD	-1
+#define	PCMCIA_PRODUCT_COREGA_ETHER_II_PCC_TD	0xffffffff
 #define	PCMCIA_STR_COREGA_ETHER_II_PCC_TD	"Corega EtherII PCC-TD"
 #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_PRODUCT_COREGA_FAST_ETHER_PCC_TX	0xffffffff
 #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_PRODUCT_COREGA_FETHER_PCC_TXD	0xffffffff
 #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_PRODUCT_COREGA_FETHER_PCC_TXF	0xffffffff
 #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_PRODUCT_COREGA_WIRELESS_LAN_PCC_11	0xffffffff
 #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_PRODUCT_COREGA_WIRELESS_LAN_PCCA_11	0xffffffff
 #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_PRODUCT_COREGA_WIRELESS_LAN_PCCB_11	0xffffffff
 #define	PCMCIA_STR_COREGA_WIRELESS_LAN_PCCB_11	"Corega Wireless LAN PCCB-11"
+#define	PCMCIA_CIS_COREGA_WIRELESS_LAN_PCCL_11	{ "corega", "WL PCCL-11", NULL, NULL }
+#define	PCMCIA_PRODUCT_COREGA_WIRELESS_LAN_PCCL_11	0xffffffff
+#define	PCMCIA_STR_COREGA_WIRELESS_LAN_PCCL_11	"Corega Wireless LAN PCCL-11"
 
 #define	PCMCIA_CIS_DIGITAL_DEPCMXX	{ "DIGITAL", "DEPCM-XX", NULL, NULL }
-#define	PCMCIA_PRODUCT_DIGITAL_DEPCMXX	-1
+#define	PCMCIA_PRODUCT_DIGITAL_DEPCMXX	0xffffffff
 #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_PRODUCT_DLINK_DE650	0xffffffff
 #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_PRODUCT_DLINK_DE660	0xffffffff
 #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_PRODUCT_DLINK_DE660PLUS	0xffffffff
 #define	PCMCIA_STR_DLINK_DE660PLUS	"D-Link DE-660+"
 #define	PCMCIA_CIS_DLINK_DFE670TXD	{ "D-Link", "DFE-670TXD", NULL, NULL }
-#define	PCMCIA_PRODUCT_DLINK_DFE670TXD	-1
+#define	PCMCIA_PRODUCT_DLINK_DFE670TXD	0xffffffff
 #define	PCMCIA_STR_DLINK_DFE670TXD	"D-Link DFE-670TXD"
 #define	PCMCIA_CIS_DLINK_DWL650H	{ "D-Link Corporation", "D-Link DWL-650H 11Mbps WLAN Adapter", NULL, NULL }
-#define	PCMCIA_PRODUCT_DLINK_DWL650H	-1
+#define	PCMCIA_PRODUCT_DLINK_DWL650H	0xffffffff
 #define	PCMCIA_STR_DLINK_DWL650H	"D-Link DWL-650H"
 #define	PCMCIA_CIS_DYNALINK_L10C	{ "DYNALINK", "L10C", NULL, NULL }
-#define	PCMCIA_PRODUCT_DYNALINK_L10C	-1
+#define	PCMCIA_PRODUCT_DYNALINK_L10C	0xffffffff
 #define	PCMCIA_STR_DYNALINK_L10C	"Dynalink L10C"
 /*
  * vendor ID of EPX_AA2000 is Fujitsu (0x0004) and product ID is 0x2000, but
  * it conflicts with Fujitsu Towa LA501 Ethernet.
  */
 #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_PRODUCT_EIGERLABS_EPX_AA2000	0xffffffff
 #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_PRODUCT_EPSON_EEN10B	0xffffffff
 #define	PCMCIA_STR_EPSON_EEN10B	"Epson EEN10B"
 #define	PCMCIA_CIS_EPSON_SC200	{ "EPSON", "SCSI-2 PC Card SC200", NULL, NULL }
-#define	PCMCIA_PRODUCT_EPSON_SC200	-1
+#define	PCMCIA_PRODUCT_EPSON_SC200	0xffffffff
 #define	PCMCIA_STR_EPSON_SC200	"Media Intelligent SCSI-2 PC Card MSC-200"
 #define	PCMCIA_CIS_EXP_EXPMULTIMEDIA	{ "EXP   ", "PnPIDE", "F1", NULL }
-#define	PCMCIA_PRODUCT_EXP_EXPMULTIMEDIA	-1
+#define	PCMCIA_PRODUCT_EXP_EXPMULTIMEDIA	0xffffffff
 #define	PCMCIA_STR_EXP_EXPMULTIMEDIA	"EXP IDE/ATAPI DVD Card"
 #define	PCMCIA_CIS_FUJITSU_FMV_J181	{ "PCMCIA MBH10302", "01", NULL, NULL }
-#define	PCMCIA_PRODUCT_FUJITSU_FMV_J181	-1
+#define	PCMCIA_PRODUCT_FUJITSU_FMV_J181	0xffffffff
 #define	PCMCIA_STR_FUJITSU_FMV_J181	"FUJITSU FMV-J181 PCMCIA Card"
 #define	PCMCIA_CIS_FUJITSU_FMV_J182	{ "FUJITSU", "LAN Card(FMV-J182)", "Ver.01", NULL }
-#define	PCMCIA_PRODUCT_FUJITSU_FMV_J182	-1
+#define	PCMCIA_PRODUCT_FUJITSU_FMV_J182	0xffffffff
 #define	PCMCIA_STR_FUJITSU_FMV_J182	"FUJITSU FMV-J182 PCMCIA Card"
 #define	PCMCIA_CIS_FUJITSU_FMV_J182A	{ "FUJITSU", "LAN Card(FMV-J182)", "Ver.02", NULL }
-#define	PCMCIA_PRODUCT_FUJITSU_FMV_J182A	-1
+#define	PCMCIA_PRODUCT_FUJITSU_FMV_J182A	0xffffffff
 #define	PCMCIA_STR_FUJITSU_FMV_J182A	"FUJITSU FMV-J182A PCMCIA Card"
 #define	PCMCIA_CIS_FUJITSU_ITCFJ182A	{ "FUJITSU", "LAN Card(ITCFJ182)", "Ver.01", NULL }
-#define	PCMCIA_PRODUCT_FUJITSU_ITCFJ182A	-1
+#define	PCMCIA_PRODUCT_FUJITSU_ITCFJ182A	0xffffffff
 #define	PCMCIA_STR_FUJITSU_ITCFJ182A	"FUJITSU ITCFJ182A CompactCard"
 #define	PCMCIA_CIS_FUTUREDOMAIN_SCSI2GO	{ "Future Domain Corporation" "SCSI PCMCIA Credit Card Controller", NULL, NULL }
-#define	PCMCIA_PRODUCT_FUTUREDOMAIN_SCSI2GO	-1
+#define	PCMCIA_PRODUCT_FUTUREDOMAIN_SCSI2GO	0xffffffff
 #define	PCMCIA_STR_FUTUREDOMAIN_SCSI2GO	"Future Domain SCSI2GO"
 #define	PCMCIA_CIS_GEMTEK_WLAN	{ "Intersil", "PRISM 2_5 PCMCIA ADAPTER", "ISL37300P", "Eval-RevA" }
-#define	PCMCIA_PRODUCT_GEMTEK_WLAN	-1
+#define	PCMCIA_PRODUCT_GEMTEK_WLAN	0xffffffff
 #define	PCMCIA_STR_GEMTEK_WLAN	"GEMTEK Prism2_5 WaveLAN Card"
 #define	PCMCIA_CIS_IBM_SCSICARD	{ "IBM Corp.", "SCSI PCMCIA Card", NULL, NULL }
-#define	PCMCIA_PRODUCT_IBM_SCSICARD	-1
+#define	PCMCIA_PRODUCT_IBM_SCSICARD	0xffffffff
 #define	PCMCIA_STR_IBM_SCSICARD	"IBM SCSI PCMCIA Card"
 #define	PCMCIA_CIS_ICOM_SL200	{ "Icom", "SL-200", NULL, NULL }
-#define	PCMCIA_PRODUCT_ICOM_SL200	-1
+#define	PCMCIA_PRODUCT_ICOM_SL200	0xffffffff
 #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_PRODUCT_INTERSIL_PRISM2	0xffffffff
 #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_PRODUCT_IODATA_CBIDE2	0xffffffff
 #define	PCMCIA_STR_IODATA_CBIDE2	"IO-DATA CBIDE2/16-bit mode"
 #define	PCMCIA_CIS_IODATA3_CBSC16	{ "IO DATA", "CBSC16       ", NULL, NULL }
-#define	PCMCIA_PRODUCT_IODATA3_CBSC16	-1
+#define	PCMCIA_PRODUCT_IODATA3_CBSC16	0xffffffff
 #define	PCMCIA_STR_IODATA3_CBSC16	"IO-DATA CBSC16"
 #define	PCMCIA_CIS_IODATA_PCLAT	{ "I-O DATA", "PCLA", "ETHERNET", NULL }
-#define	PCMCIA_PRODUCT_IODATA_PCLAT	-1
+#define	PCMCIA_PRODUCT_IODATA_PCLAT	0xffffffff
 #define	PCMCIA_STR_IODATA_PCLAT	"IO-DATA PCLA/T"
 #define	PCMCIA_CIS_LANTECH_FASTNETTX	{ "ASIX", "AX88190", NULL, NULL }
-#define	PCMCIA_PRODUCT_LANTECH_FASTNETTX	-1
+#define	PCMCIA_PRODUCT_LANTECH_FASTNETTX	0xffffffff
 #define	PCMCIA_STR_LANTECH_FASTNETTX	"Lantech Fastnet/TX"
 #define	PCMCIA_CIS_LINKSYS_ECARD_2	{ "LINKSYS", "E-CARD", NULL, NULL }
-#define	PCMCIA_PRODUCT_LINKSYS_ECARD_2	-1
+#define	PCMCIA_PRODUCT_LINKSYS_ECARD_2	0xffffffff
 #define	PCMCIA_STR_LINKSYS_ECARD_2	"Linksys E-Card"
 #define	PCMCIA_CIS_LINKSYS_PCM100	{ "Linksys", "EtherFast 10/100 Integrated PC Card (PCM100)", "Ver 1.0", NULL }
-#define	PCMCIA_PRODUCT_LINKSYS_PCM100	-1
+#define	PCMCIA_PRODUCT_LINKSYS_PCM100	0xffffffff
 #define	PCMCIA_STR_LINKSYS_PCM100	""
 #define	PCMCIA_CIS_MACNICA_MPS100	{ "MACNICA", "MIRACLE SCSI", "mPS100", "D.0" }
-#define	PCMCIA_PRODUCT_MACNICA_MPS100	-1
+#define	PCMCIA_PRODUCT_MACNICA_MPS100	0xffffffff
 #define	PCMCIA_STR_MACNICA_MPS100	"Macnica Miracle SCSI mPS100"
 #define	PCMCIA_CIS_MEGAHERTZ_XJ2288	{ "MEGAHERTZ", "MODEM XJ2288", NULL, NULL }
-#define	PCMCIA_PRODUCT_MEGAHERTZ_XJ2288	-1
+#define	PCMCIA_PRODUCT_MEGAHERTZ_XJ2288	0xffffffff
 #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_PRODUCT_MELCO_LPC2_TX	0xffffffff
 #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_PRODUCT_NAKAGAWAMETAL_LNT10TN	0xffffffff
 #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_PRODUCT_NANOSPEED_PRISM2	0xffffffff
 #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_PRODUCT_NDC_ND5100_E	0xffffffff
 #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_PRODUCT_NEC_CMZ_RT_WP	0xffffffff
 #define	PCMCIA_STR_NEC_CMZ_RT_WP	"NEC Wireless Card CMZ-RT-WP"
 #define	PCMCIA_CIS_NEC_PC9801N_J03R	{ "NEC", "PC-9801N-J03R", NULL, NULL }
-#define	PCMCIA_PRODUCT_NEC_PC9801N_J03R	-1
+#define	PCMCIA_PRODUCT_NEC_PC9801N_J03R	0xffffffff
 #define	PCMCIA_STR_NEC_PC9801N_J03R	"NEC PC-9801N-J03R"
 #define	PCMCIA_CIS_NEWMEDIA_BASICS_SCSI	{ "BASICS by New Media Corporation" "SCSI Sym53C500", NULL, NULL }
-#define	PCMCIA_PRODUCT_NEWMEDIA_BASICS_SCSI	-1
+#define	PCMCIA_PRODUCT_NEWMEDIA_BASICS_SCSI	0xffffffff
 #define	PCMCIA_STR_NEWMEDIA_BASICS_SCSI	"New Media Corporation BASICS SCSI"
 #define	PCMCIA_CIS_NTT_ME_WLAN	{ "NTT-ME", "11Mbps Wireless LAN PC Card", NULL, NULL }
-#define	PCMCIA_PRODUCT_NTT_ME_WLAN	-1
+#define	PCMCIA_PRODUCT_NTT_ME_WLAN	0xffffffff
 #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_PRODUCT_PLANET_SMARTCOM2000	0xffffffff
 #define	PCMCIA_STR_PLANET_SMARTCOM2000	"Planet SmartCOM 2000"
 /*
  * vendor ID of both FNW-3600-T and FNW-3700-T is LINKSYS (0x0149) and
@@ -965,43 +970,43 @@
 #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_PRODUCT_RPTI_EP400	0xffffffff
 #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_PRODUCT_RPTI_EP401	0xffffffff
 #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_PRODUCT_PREMAX_PE200	0xffffffff
 #define	PCMCIA_STR_PREMAX_PE200	"PreMax PE-200"
 #define	PCMCIA_CIS_RATOC_REX_R280	{ "RATOC System Inc.", "10BASE_T CARD R280", NULL, NULL }
-#define	PCMCIA_PRODUCT_RATOC_REX_R280	-1
+#define	PCMCIA_PRODUCT_RATOC_REX_R280	0xffffffff
 #define	PCMCIA_STR_RATOC_REX_R280	"RATOC REX-R280"
 #define	PCMCIA_CIS_RATOC_REX5536	{ "1195 RATOC System Inc.", "REX5536 SCSI2 CARD", NULL, NULL }
-#define	PCMCIA_PRODUCT_RATOC_REX5536	-1
+#define	PCMCIA_PRODUCT_RATOC_REX5536	0xffffffff
 #define	PCMCIA_STR_RATOC_REX5536	"RATOC REX-5536"
 #define	PCMCIA_CIS_RATOC_REX5536AM	{ "PCMCIA SCSI MBH10404", "01", NULL, NULL }
-#define	PCMCIA_PRODUCT_RATOC_REX5536AM	-1
+#define	PCMCIA_PRODUCT_RATOC_REX5536AM	0xffffffff
 #define	PCMCIA_STR_RATOC_REX5536AM	"RATOC REX-5536AM"
 #define	PCMCIA_CIS_RATOC_REX5536M	{ "PCMCIA SCSI2 CARD", "01", NULL, NULL }
-#define	PCMCIA_PRODUCT_RATOC_REX5536M	-1
+#define	PCMCIA_PRODUCT_RATOC_REX5536M	0xffffffff
 #define	PCMCIA_STR_RATOC_REX5536M	"RATOC REX-5536M"
 #define	PCMCIA_CIS_RATOC_REX5572	{ "RATOC System Inc.", "SOUND/SCSI2 CARD", NULL, NULL }
-#define	PCMCIA_PRODUCT_RATOC_REX5572	-1
+#define	PCMCIA_PRODUCT_RATOC_REX5572	0xffffffff
 #define	PCMCIA_STR_RATOC_REX5572	"RATOC REX-5572"
 #define	PCMCIA_CIS_RATOC_REX9530	{ "RATOC System Inc.", "SCSI2 CARD 37", NULL, NULL }
-#define	PCMCIA_PRODUCT_RATOC_REX9530	-1
+#define	PCMCIA_PRODUCT_RATOC_REX9530	0xffffffff
 #define	PCMCIA_STR_RATOC_REX9530	"RATOC REX-9530"
 #define	PCMCIA_CIS_SIMPLETECH_SPECTRUM24_ALT	{ "Symbol Technologies", "LA4111 Spectrum24 Wireless LAN PC Card", NULL, NULL }
-#define	PCMCIA_PRODUCT_SIMPLETECH_SPECTRUM24_ALT	-1
+#define	PCMCIA_PRODUCT_SIMPLETECH_SPECTRUM24_ALT	0xffffffff
 #define	PCMCIA_STR_SIMPLETECH_SPECTRUM24_ALT	"LA4111 Spectrum24 Wireless LAN PC Card"
 #define	PCMCIA_CIS_SMC_2632W	{ "SMC", "SMC2632W", "Version 01.02", NULL }
-#define	PCMCIA_PRODUCT_SMC_2632W	-1
+#define	PCMCIA_PRODUCT_SMC_2632W	0xffffffff
 #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_PRODUCT_SVEC_COMBOCARD	0xffffffff
 #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_PRODUCT_SVEC_LANCARD	0xffffffff
 #define	PCMCIA_STR_SVEC_LANCARD	"SVEC PCMCIA Lan Card"
 /*
  * vendor ID of PN650TX is LINKSYS (0x0149) and product ID is 0xc1ab, but
@@ -1011,23 +1016,26 @@
 #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_PRODUCT_SYNERGY21_S21810	0xffffffff
 #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_PRODUCT_TEAC_IDECARDII	0xffffffff
 #define	PCMCIA_STR_TEAC_IDECARDII	"TEAC IDE Card/II"
+#define	PCMCIA_CIS_TOSHIBA_CBIDE2	{ "LOOKMEET", "CBIDE2      ", NULL, NULL }
+#define	PCMCIA_PRODUCT_TOSHIBA_CBIDE2	0xffffffff
+#define	PCMCIA_STR_TOSHIBA_CBIDE2	"TOSHIBA PA2673U CBIDE2/16-bit mode (IO-DATA OEM)"
 #define	PCMCIA_CIS_WORKBIT2_NINJA_SCSI3	{ "WBT", "NinjaSCSI-3", NULL, NULL }
-#define	PCMCIA_PRODUCT_WORKBIT2_NINJA_SCSI3	-1
+#define	PCMCIA_PRODUCT_WORKBIT2_NINJA_SCSI3	0xffffffff
 #define	PCMCIA_STR_WORKBIT2_NINJA_SCSI3	"WORKBIT Ninja SCSI series"
 #define	PCMCIA_CIS_XIRCOM_CFE_10	{ "Xircom", "CompactCard Ethernet", "CFE-10", "1.00" }
-#define	PCMCIA_PRODUCT_XIRCOM_CFE_10	-1
+#define	PCMCIA_PRODUCT_XIRCOM_CFE_10	0xffffffff
 #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_PRODUCT_YEDATA_EXTERNAL_FDD	0xffffffff
 #define	PCMCIA_STR_YEDATA_EXTERNAL_FDD	"Y-E DATA External FDD"
 #define	PCMCIA_CIS_YIS_YWL11B	{ "YIS Corp.", "YWL-11b", NULL, NULL }
-#define	PCMCIA_PRODUCT_YIS_YWL11B	-1
+#define	PCMCIA_PRODUCT_YIS_YWL11B	0xffffffff
 #define	PCMCIA_STR_YIS_YWL11B	"YIS Corp. YWL-11b"
 #define	PCMCIA_CIS_ZOOM_AIR_4000	{ "Zoom", "Air-4000", NULL, NULL }
-#define	PCMCIA_PRODUCT_ZOOM_AIR_4000	-1
+#define	PCMCIA_PRODUCT_ZOOM_AIR_4000	0xffffffff
 #define	PCMCIA_STR_ZOOM_AIR_4000	"Zoom Air-4000"