sync to 1.36 of pccarddevs

1 files changed, 52 insertions, 20 deletions

diff --git a/sys/dev/pccard/pccarddevs.h b/sys/dev/pccard/pccarddevs.h
index 068ff42..9083e5f 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.35 2002/10/11 05:40:13 imp Exp 
+ *	FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.36 2002/10/11 07:00:30 imp Exp 
  */
-/* $NetBSD: pcmciadevs,v 1.163 2002/03/04 16:41:50 martin Exp $ */
+/* $NetBSD: pcmciadevs,v 1.177 2002/09/15 17:43:48 bouyer Exp $ */
 /* $OpenBSD: pcmciadevs,v 1.93 2002/06/21 08:31:10 henning Exp $ */
 
 /*-
@@ -50,7 +50,7 @@
  */
 
 #define	PCMCIA_VENDOR_FUJITSU	0x0004	/* Fujitsu Corporation */
-#define	PCMCIA_VENDOR_NETGEAR2	0x000b	/* Netgear */
+#define	PCMCIA_VENDOR_NETGEAR_2	0x000b	/* Netgear */
 #define	PCMCIA_VENDOR_PANASONIC	0x0032	/* Matsushita Electric Industrial Co. */
 #define	PCMCIA_VENDOR_SANDISK	0x0045	/* Sandisk Corporation */
 #define	PCMCIA_VENDOR_NEWMEDIA	0x0057	/* New Media Corporation */
@@ -71,7 +71,9 @@
 #define	PCMCIA_VENDOR_ADAPTEC	0x012f	/* Adaptec Corporation */
 #define	PCMCIA_VENDOR_QUATECH	0x0137	/* Quatech */
 #define	PCMCIA_VENDOR_COMPAQ	0x0138	/* Compaq */
+#define	PCMCIA_VENDOR_OSITECH	0x0140	/* Ositech */
 #define	PCMCIA_VENDOR_DLINK_2	0x0143	/* D-Link */
+#define	PCMCIA_VENDOR_DLINK_3	0x0149	/* D-Link */
 #define	PCMCIA_VENDOR_LINKSYS	0x0149	/* Linksys Corporation */
 #define	PCMCIA_VENDOR_NETGEAR	0x0149	/* Netgear */
 #define	PCMCIA_VENDOR_SIMPLETECH	0x014d	/* Simple Technology */
@@ -99,7 +101,7 @@
 #define	PCMCIA_VENDOR_NWN	0x0602	/* No Wires Needed */
 #define	PCMCIA_VENDOR_BREEZECOM	0x0a02	/* BreezeCOM */
 #define	PCMCIA_VENDOR_NEWMEDIA2	0x10cd	/* NewMedia */
-#define	PCMCIA_VENDOR_PLANEX2	0x14ea	/* PLANEX */
+#define	PCMCIA_VENDOR_PLANEX_2	0x14ea	/* PLANEX */
 #define	PCMCIA_VENDOR_ACTIONTEC	0x1668	/* ACTIONTEC */
 #define	PCMCIA_VENDOR_LASAT	0x3401	/* Lasat Communications A/S */
 #define	PCMCIA_VENDOR_BONDWELL	0x3b01	/* Bondwell */
@@ -160,10 +162,10 @@
 #define	PCMCIA_PRODUCT_3COM_3CRWE62092A	0x2092
 #define	PCMCIA_STR_3COM_3CRWE62092A	"3Com 3CRWE62092A Wireless LAN"
 
-/* ACTIONTEC */
-#define	PCMCIA_CIS_ACTIONTEC_HWC01170	{ NULL, NULL, NULL, NULL }
-#define	PCMCIA_PRODUCT_ACTIONTEC_HWC01170	0x0101
-#define	PCMCIA_STR_ACTIONTEC_HWC01170	"ACTIONTEC Wireless LAN PC CARD"
+/* ACTIONTEC Products */
+#define	PCMCIA_CIS_ACTIONTEC_PRISM	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_ACTIONTEC_PRISM	0x0101
+#define	PCMCIA_STR_ACTIONTEC_PRISM	"PRISM Wireless LAN PC Card"
 
 /* Adaptec Products */
 #define	PCMCIA_CIS_ADAPTEC_APA1460	{ NULL, NULL, NULL, NULL }
@@ -204,6 +206,9 @@
 #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"
+#define	PCMCIA_CIS_BAY_EMOBILITY_11B	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_BAY_EMOBILITY_11B	0x080a
+#define	PCMCIA_STR_BAY_EMOBILITY_11B	"e-Mobility 11Mb Wireless LAN"
 
 /* Bondwell */
 #define	PCMCIA_CIS_BONDWELL_B236	{ NULL, NULL, NULL, NULL }
@@ -219,6 +224,9 @@
 #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"
+#define	PCMCIA_CIS_BUFFALO_LPC3_CLT	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_BUFFALO_LPC3_CLT	0x030a
+#define	PCMCIA_STR_BUFFALO_LPC3_CLT	"BUFFALO LPC3-CLT Ethernet Adapter"
 #define	PCMCIA_CIS_BUFFALO_WLI_CF_S11G	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_BUFFALO_WLI_CF_S11G	0x030b
 #define	PCMCIA_STR_BUFFALO_WLI_CF_S11G	"BUFFALO AirStation 11Mbps CF WLAN"
@@ -407,9 +415,12 @@
 #define	PCMCIA_CIS_LINKSYS2_IWN	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_LINKSYS2_IWN	0x1612
 #define	PCMCIA_STR_LINKSYS2_IWN	"Instant Wireless Network PC Card"
-#define	PCMCIA_CIS_LINKSYS2_IWN2	{ NULL, NULL, NULL, NULL }
-#define	PCMCIA_PRODUCT_LINKSYS2_IWN2	0x1613
-#define	PCMCIA_STR_LINKSYS2_IWN2	"Instant Wireless Network PC Card"
+#define	PCMCIA_CIS_LINKSYS2_IWN3	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_LINKSYS2_IWN3	0x1613
+#define	PCMCIA_STR_LINKSYS2_IWN3	"Instant Wireless Network PC Card, Versin 3"
+#define	PCMCIA_CIS_LINKSYS2_WCF11	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_LINKSYS2_WCF11	0x3301
+#define	PCMCIA_STR_LINKSYS2_WCF11	"Instant Wireless Network CF Card"
 
 /* Lucent WaveLAN/IEEE */
 #define	PCMCIA_CIS_LUCENT_WAVELAN_IEEE	{ NULL, NULL, NULL, NULL }
@@ -484,15 +495,18 @@
 #define	PCMCIA_STR_NEWMEDIA2_BUSTOASTER	"NewMedia BusToaster"
 
 /* Netgear */
+#define	PCMCIA_CIS_NETGEAR_FA410TX	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_NETGEAR_FA410TX	0x0230
+#define	PCMCIA_STR_NETGEAR_FA410TX	"Netgear FA410TX"
 #define	PCMCIA_CIS_NETGEAR_FA410TXC	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_NETGEAR_FA410TXC	0x4530
 #define	PCMCIA_STR_NETGEAR_FA410TXC	"Netgear FA410TXC"
 #define	PCMCIA_CIS_NETGEAR_FA411	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_NETGEAR_FA411	0x0411
 #define	PCMCIA_STR_NETGEAR_FA411	"Netgear FA411"
-#define	PCMCIA_CIS_NETGEAR2_MA401RA	{ NULL, NULL, NULL, NULL }
-#define	PCMCIA_PRODUCT_NETGEAR2_MA401RA	0x7300
-#define	PCMCIA_STR_NETGEAR2_MA401RA	"Netgear MA401RA"
+#define	PCMCIA_CIS_NETGEAR_2_MA401RA	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_NETGEAR_2_MA401RA	0x7300
+#define	PCMCIA_STR_NETGEAR_2_MA401RA	"Netgear MA401RA"
 
 /* National Instruments */
 #define	PCMCIA_CIS_NI_PCMCIA_GPIB	{ NULL, NULL, NULL, NULL }
@@ -520,6 +534,11 @@
 #define	PCMCIA_PRODUCT_OLICOM_TR	0x2132
 #define	PCMCIA_STR_OLICOM_TR	"GoCard Token Ring 16/4"
 
+/* Ositech Products */
+#define	PCMCIA_CIS_OSITECH_TRUMPCARD_SOD	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_OSITECH_TRUMPCARD_SOD	0x0008
+#define	PCMCIA_STR_OSITECH_TRUMPCARD_SOD	"Ositech Seven of Diamonds Ethernet Card"
+
 /* Panasonic Products */
 #define	PCMCIA_CIS_PANASONIC_KXLC002	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_PANASONIC_KXLC002	0x0304
@@ -535,9 +554,9 @@
 #define	PCMCIA_STR_PANASONIC_KME	"Panasonic CD-R/RW Interface"
 
 /* Planex */
-#define	PCMCIA_CIS_PLANEX2_GWNS11H	{ NULL, NULL, NULL, NULL }
-#define	PCMCIA_PRODUCT_PLANEX2_GWNS11H	0xb001
-#define	PCMCIA_STR_PLANEX2_GWNS11H	"Planex GW-NS11H"
+#define	PCMCIA_CIS_PLANEX_2_GWNS11H	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_PLANEX_2_GWNS11H	0xb001
+#define	PCMCIA_STR_PLANEX_2_GWNS11H	"Planex GW-NS11H"
 
 /* Proxim */
 #define	PCMCIA_CIS_PROXIM_ROAMABOUT_2400FH	{ NULL, NULL, NULL, NULL }
@@ -709,6 +728,7 @@
 #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 */
@@ -731,18 +751,21 @@
 #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_ACCTON_EN2216	{ "ACCTON", "EN2216-PCMCIA-ETHERNET", "EN2216R01", NULL }
+#define	PCMCIA_PRODUCT_ACCTON_EN2216	-1
+#define	PCMCIA_STR_ACCTON_EN2216	"Accton EN2216"
 #define	PCMCIA_CIS_ADDTRON_AWP100	{ "Addtron", "AWP-100 Wireless PCMCIA", "Version 01.02", NULL }
 #define	PCMCIA_PRODUCT_ADDTRON_AWP100	-1
 #define	PCMCIA_STR_ADDTRON_AWP100	""
 #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_ARGOSY_SP320	{ "PCMCIA", "RS-COM 2P", NULL, NULL
-#define	PCMCIA_PRODUCT_ARGOSY_SP320	-1
-#define	PCMCIA_STR_ARGOSY_SP320	"} ARGOSY SP320 Dual port serial PCMCIA"
 #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_ARGOSY_SP320	{ "PCMCIA", "RS-COM 2P", NULL, NULL
+#define	PCMCIA_PRODUCT_ARGOSY_SP320	-1
+#define	PCMCIA_STR_ARGOSY_SP320	"} ARGOSY SP320 Dual port serial PCMCIA"
 #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"
@@ -758,6 +781,9 @@
 #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_ETHER_II_PCC_TD	{ "corega K.K.", "corega EtherII PCC-TD", NULL, NULL }
+#define	PCMCIA_PRODUCT_COREGA_ETHER_II_PCC_TD	-1
+#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_STR_COREGA_FAST_ETHER_PCC_TX	"Corega FastEther PCC-TX"
@@ -789,6 +815,12 @@
 #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+"
+#define	PCMCIA_CIS_DLINK_DFE670TXD	{ "D-Link", "DFE-670TXD", NULL, NULL }
+#define	PCMCIA_PRODUCT_DLINK_DFE670TXD	-1
+#define	PCMCIA_STR_DLINK_DFE670TXD	"D-Link DFE-670TXD"
+#define	PCMCIA_CIS_DYNALINK_L10C	{ "DYNALINK", "L10C", NULL, NULL }
+#define	PCMCIA_PRODUCT_DYNALINK_L10C	-1
+#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.