Sync to pccarddevs 1.12

1 files changed, 68 insertions, 7 deletions

diff --git a/sys/dev/pccard/pccarddevs.h b/sys/dev/pccard/pccarddevs.h
index 7423816..fb1e6ae 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.11 2001/03/22 05:51:58 imp Exp 
+ *	FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.12 2001/07/05 03:19:43 imp Exp 
  */
-/* $NetBSD: pcmciadevs,v 1.111 2001/01/20 01:56:16 imp Exp $ */
+/* $NetBSD: pcmciadevs,v 1.131 2001/06/29 14:56:22 christos Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -61,12 +61,14 @@
 #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_MEGAHERTZ2	0x0128	/* Megahertz Corporation */
 #define	PCCARD_VENDOR_OLICOM	0x0121	/* Olicom */
 #define	PCCARD_VENDOR_ADAPTEC	0x012f	/* Adaptec Corporation */
 #define	PCCARD_VENDOR_COMPAQ	0x0138	/* Compaq */
 #define	PCCARD_VENDOR_LINKSYS	0x0149	/* Linksys Corporation */
+#define	PCCARD_VENDOR_DLINK_2	0x0143	/* D-Link */
 #define	PCCARD_VENDOR_SIMPLETECH	0x014d	/* Simple Technology */
 #define	PCCARD_VENDOR_LUCENT	0x0156	/* Lucent Technologies */
 #define	PCCARD_VENDOR_AIRONET	0x015f	/* Aironet Wireless Communications */
@@ -80,6 +82,8 @@
 #define	PCCARD_VENDOR_TELECOMDEVICE	0x021b	/* Telecom Device */
 #define	PCCARD_VENDOR_NOKIA	0x023d	/* Nokia Communications */
 #define	PCCARD_VENDOR_SAMSUNG	0x0250	/* Samsung */
+#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 */
@@ -139,6 +143,9 @@
 #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	PCCARD_CIS_COMPAQ_NC5004	{ NULL, NULL, NULL, NULL }
+#define	PCCARD_PRODUCT_COMPAQ_NC5004	0x0002
+#define	PCCARD_STR_COMPAQ_NC5004	"Compaq Agency NC5004 Wireless Card"
 
 /* Compex Products */
 #define	PCCARD_CIS_COMPEX_LINKPORT_ENET_B	{ NULL, NULL, NULL, NULL }
@@ -163,6 +170,11 @@
 #define	PCCARD_PRODUCT_DIGITAL_MOBILE_MEDIA_CDROM	0x0d00
 #define	PCCARD_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"
+
 /* ELSA Products */
 #define	PCCARD_CIS_ELSA_MC2_IEEE	{ NULL, NULL, NULL, NULL }
 #define	PCCARD_PRODUCT_ELSA_MC2_IEEE	0x0001
@@ -230,11 +242,17 @@
 #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	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"
 
 /* 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"
 
 /* Farallon */
 #define	PCCARD_CIS_FARALLON_SKYLINE	{ NULL, NULL, NULL, NULL }
@@ -282,6 +300,11 @@
 #define	PCCARD_PRODUCT_MELCO_LPC3_TX	0xc1ab
 #define	PCCARD_STR_MELCO_LPC3_TX	"Melco LPC3-TX"
 
+/* 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"
+
 /* Nokia Products */
 #define	PCCARD_CIS_NOKIA_C020_WLAN	{ NULL, NULL, NULL, NULL }
 #define	PCCARD_PRODUCT_NOKIA_C020_WLAN	0x20c0
@@ -320,6 +343,9 @@
 #define	PCCARD_STR_SIMPLETECH_SPECTRUM24	"Symbol Spectrum24 WLAN Adapter"
 
 /* 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"
@@ -343,6 +369,9 @@
 #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_LAK_CD011WL	{ NULL, NULL, NULL, NULL }
+#define	PCCARD_PRODUCT_TDK_LAK_CD011WL	0x0000
+#define	PCCARD_STR_TDK_LAK_CD011WL	"TDK LAK-CD011WL"
 
 /* Xircom Products */
 #define	PCCARD_CIS_XIRCOM_CE	{ NULL, NULL, NULL, NULL }
@@ -354,6 +383,9 @@
 #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_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"
@@ -396,6 +428,9 @@
 #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"
 
 /* Roland */
 #define	PCCARD_CIS_ROLAND_SCP55	{ NULL, NULL, NULL, NULL }
@@ -407,11 +442,6 @@
 #define	PCCARD_PRODUCT_ALLIEDTELESIS_LA_PCM	0x0002
 #define	PCCARD_STR_ALLIEDTELESIS_LA_PCM	"Allied Telesis LA-PCM"
 
-/* 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"
-
 /* Lucent WaveLAN/IEEE */
 #define	PCCARD_CIS_LUCENT_WAVELAN_IEEE	{ NULL, NULL, NULL, NULL }
 #define	PCCARD_PRODUCT_LUCENT_WAVELAN_IEEE	0x0002
@@ -424,6 +454,9 @@
 #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"
 
 /* Bay Networks */
 #define	PCCARD_CIS_BAY_STACK_650	{ NULL, NULL, NULL, NULL }
@@ -461,6 +494,11 @@
 #define	PCCARD_PRODUCT_EMTAC_WLAN	0x0002
 #define	PCCARD_STR_EMTAC_WLAN	"EMTAC A2424i 11Mbps WLAN Card"
 
+/* 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"
+
 /* Cards we know only by their cis */
 #define	PCCARD_VENDOR_PREMAX	-1	/* Premax */
 #define	PCCARD_VENDOR_PLANET	-1	/* Planet */
@@ -480,6 +518,8 @@
 #define	PCCARD_VENDOR_BILLIONTON	-1	/* Billionton Systems Inc. */
 #define	PCCARD_VENDOR_AMD	-1	/* AMD */
 #define	PCCARD_VENDOR_INTERSIL	-1	/* Intersil */
+#define	PCCARD_VENDOR_SYNERGY21	-1	/* Synergy 21 */
+#define	PCCARD_VENDOR_CNET	-1	/* CNet */
 
 #define	PCCARD_CIS_MEGAHERTZ_XJ2288	{ "MEGAHERTZ", "MODEM XJ2288", NULL, NULL }
 #define	PCCARD_PRODUCT_MEGAHERTZ_XJ2288	-1
@@ -536,9 +576,18 @@
 #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_SVEC_COMBOCARD	{ "Ethernet", "Adapter", NULL, NULL }
 #define	PCCARD_PRODUCT_SVEC_COMBOCARD	-1
 #define	PCCARD_STR_SVEC_COMBOCARD	"SVEC/Hawking Tech. Combo Card"
@@ -597,6 +646,18 @@
 #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_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_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_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_ZOOM_AIR_4000	{ "Zoom", "Air-4000", NULL, NULL }
 #define	PCCARD_PRODUCT_ZOOM_AIR_4000	-1
 #define	PCCARD_STR_ZOOM_AIR_4000	"Zoom Air-4000"