sync

1 files changed, 40 insertions, 33 deletions

diff --git a/sys/dev/pcmcia/pcmciadevs.h b/sys/dev/pcmcia/pcmciadevs.h
index 9480d5f2d15..19551c7182e 100644
--- a/sys/dev/pcmcia/pcmciadevs.h
+++ b/sys/dev/pcmcia/pcmciadevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: pcmciadevs.h,v 1.26 1999/08/18 22:41:22 d Exp $	*/
+/*	$OpenBSD: pcmciadevs.h,v 1.27 1999/08/25 21:55:49 fgsch Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *		OpenBSD: pcmciadevs,v 1.22 1999/08/18 05:29:48 d Exp 
+ *		OpenBSD: pcmciadevs,v 1.23 1999/08/25 21:54:57 fgsch Exp 
  */
 /* $NetBSD: pcmciadevs,v 1.13 1998/08/17 23:10:12 thorpej Exp $ */
 
@@ -52,7 +52,7 @@
 #define	PCMCIA_VENDOR_MEGAHERTZ	0x0102	/* Megahertz */
 #define	PCMCIA_VENDOR_SOCKET	0x0104	/* Socket Communications */
 #define	PCMCIA_VENDOR_TDK	0x0105	/* TDK */
-#define	PCMCIA_VENDOR_XIRCOM	0x0105	/* Xircom -- same as TDK */
+#define	PCMCIA_VENDOR_XIRCOM	0x0105	/* Xircom */
 #define	PCMCIA_VENDOR_SMC	0x0108	/* SMC */
 #define	PCMCIA_VENDOR_MOTOROLA	0x0109	/* Motorola */
 #define	PCMCIA_VENDOR_USROBOTICS	0x0115	/* US Robotics */
@@ -63,7 +63,7 @@
 #define	PCMCIA_VENDOR_COMPAQ	0x0138	/* Compaq */
 #define	PCMCIA_VENDOR_LINKSYS	0x0149	/* Linksys */
 #define	PCMCIA_VENDOR_SIMPLETECH	0x014d	/* Simple Technology */
-#define	PCMCIA_VENDOR_SYMBOL	0x014d	/* Symbol -- same as Simple Technology */
+#define	PCMCIA_VENDOR_SYMBOL	0x014d	/* Symbol */
 #define	PCMCIA_VENDOR_LUCENT	0x0156	/* Lucent Technologies */
 #define	PCMCIA_VENDOR_COMPAQ2	0x0183	/* Compaq */
 #define	PCMCIA_VENDOR_KINGSTON	0x0186	/* Kingston */
@@ -72,13 +72,15 @@
 #define	PCMCIA_VENDOR_BREEZECOM	0x0a02	/* BreezeCOM */
 #define	PCMCIA_VENDOR_LASAT	0x3401	/* Lasat Communications A/S */
 #define	PCMCIA_VENDOR_COMPEX	0x8a01	/* Compex */
+#define	PCMCIA_VENDOR_CONTEC	0xc001	/* Contec */
 #define	PCMCIA_VENDOR_COREGA	0xc00f	/* Corega K.K. */
+#define	PCMCIA_VENDOR_ALLIEDTELESIS	0xc00f	/* Allied Telesis K.K */
 #define	PCMCIA_VENDOR_HAGIWARASYSCOM	0xc012	/* Hagiwara SYS-COM */
 
 /*
  * List of known products.  Grouped by vendor.
  */
-/* Adaptec Products */
+/* Adaptec */
 #define	PCMCIA_CIS_ADAPTEC_APA1460_1	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_ADAPTEC_APA1460_1	0x0001
 #define	PCMCIA_STR_ADAPTEC_APA1460_1	"Adaptec APA-1460/A SCSI Host Adapter"
@@ -86,17 +88,17 @@
 #define	PCMCIA_PRODUCT_ADAPTEC_APA1460_2	0x0002
 #define	PCMCIA_STR_ADAPTEC_APA1460_2	"Adaptec APA-1460/B SCSI Host Adapter"
 
-/* Allied Telesis */
-#define	PCMCIA_CIS_COREGA_LA_PCM	{ NULL, NULL, NULL, NULL }
-#define	PCMCIA_PRODUCT_COREGA_LA_PCM	0x0002
-#define	PCMCIA_STR_COREGA_LA_PCM	"Allied Telesis LA-PCM"
+/* Allied Telesis K.K. */
+#define	PCMCIA_CIS_ALLIEDTELESIS_LA_PCM	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_ALLIEDTELESIS_LA_PCM	0x0002
+#define	PCMCIA_STR_ALLIEDTELESIS_LA_PCM	"Allied Telesis LA-PCM"
 
-/* BreezeCOM Products */
+/* BreezeCOM */
 #define	PCMCIA_CIS_BREEZECOM_BREEZENET	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_BREEZECOM_BREEZENET	0x0102
 #define	PCMCIA_STR_BREEZECOM_BREEZENET	"BreezeCOM BreezeNET IEEE 802.11 FHSS"
 
-/* 3COM Products */
+/* 3COM */
 #define	PCMCIA_CIS_3COM_3CXEM556B	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_3COM_3CXEM556B	0x003d
 #define	PCMCIA_STR_3COM_3CXEM556B	"3Com/Megahertz 3CXEM556B-INT Ethernet/Modem"
@@ -113,15 +115,20 @@
 #define	PCMCIA_PRODUCT_3COM_3C574	0x0574
 #define	PCMCIA_STR_3COM_3C574	"3Com 3c574-TX"
 
-/* Compex Products */
-#define	PCMCIA_CIS_COMPEX_LINKPORT_ENET_B	{ NULL, NULL, NULL, NULL }
-#define	PCMCIA_PRODUCT_COMPEX_LINKPORT_ENET_B	0x0100
-#define	PCMCIA_STR_COMPEX_LINKPORT_ENET_B	"Compex Linkport ENET-B"
+/* Contec C-NET(PC) */
+#define	PCMCIA_CIS_CONTEC_CNETPC	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_CONTEC_CNETPC	0x0000
+#define	PCMCIA_STR_CONTEC_CNETPC	"Contec C-NET(PC)C"
+
+/* Compex */
 #define	PCMCIA_CIS_COMPEX_AMP_WIRELESS	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_COMPEX_AMP_WIRELESS	0x0066
 #define	PCMCIA_STR_COMPEX_AMP_WIRELESS	"AMP Wireless"
+#define	PCMCIA_CIS_COMPEX_LINKPORT_ENET_B	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_COMPEX_LINKPORT_ENET_B	0x0100
+#define	PCMCIA_STR_COMPEX_LINKPORT_ENET_B	"Compex Linkport ENET-B"
 
-/* Dayna Products */
+/* Dayna */
 #define	PCMCIA_CIS_DAYNA_COMMUNICARD_E_1	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_DAYNA_COMMUNICARD_E_1	0x002d
 #define	PCMCIA_STR_DAYNA_COMMUNICARD_E_1	"Dayna CommuniCard E"
@@ -129,12 +136,12 @@
 #define	PCMCIA_PRODUCT_DAYNA_COMMUNICARD_E_2	0x002f
 #define	PCMCIA_STR_DAYNA_COMMUNICARD_E_2	"Dayna CommuniCard E"
 
-/* DIGITAL Products */
+/* Digital */
 #define	PCMCIA_CIS_DIGITAL_MOBILE_MEDIA_CDROM	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_DIGITAL_MOBILE_MEDIA_CDROM	0x0d00
 #define	PCMCIA_STR_DIGITAL_MOBILE_MEDIA_CDROM	"Digital Mobile Media CD-ROM"
 
-/* Fujitsu Products */
+/* Fujitsu */
 #define	PCMCIA_CIS_FUJITSU_SCSI600	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_FUJITSU_SCSI600	0x0401
 #define	PCMCIA_STR_FUJITSU_SCSI600	"Fujitsu SCSI 600"
@@ -142,7 +149,7 @@
 #define	PCMCIA_PRODUCT_FUJITSU_LA501	0x2000
 #define	PCMCIA_STR_FUJITSU_LA501	"Fujitsu Towa LA501"
 
-/* Motorola Products */
+/* Motorola */
 #define	PCMCIA_CIS_MOTOROLA_POWER144	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_MOTOROLA_POWER144	0x0105
 #define	PCMCIA_STR_MOTOROLA_POWER144	"Motorola Power 14.4"
@@ -153,7 +160,7 @@
 #define	PCMCIA_PRODUCT_MOTOROLA_MONTANA_336	0x0505
 #define	PCMCIA_STR_MOTOROLA_MONTANA_336	"Motorola Montana 33.6"
 
-/* IBM Products */
+/* IBM */
 #define	PCMCIA_CIS_IBM_INFOMOVER	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_IBM_INFOMOVER	0x0002
 #define	PCMCIA_STR_IBM_INFOMOVER	"National Semiconductor InfoMover"
@@ -182,7 +189,7 @@
 #define	PCMCIA_PRODUCT_KINGSTON_KNE_PC2	0x0100
 #define	PCMCIA_STR_KINGSTON_KNE_PC2	"Kingston KNE-PC2"
 
-/* Lasat Products */
+/* Lasat */
 #define	PCMCIA_CIS_LASAT_CREDIT_288	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_LASAT_CREDIT_288	0x2811
 #define	PCMCIA_STR_LASAT_CREDIT_288	"Lasat Credit 288"
@@ -206,7 +213,7 @@
 #define	PCMCIA_PRODUCT_LUCENT_WAVELAN	0x0002
 #define	PCMCIA_STR_LUCENT_WAVELAN	"Lucent WaveLAN IEEE 802.11 DSSS"
 
-/* Megahertz Products */
+/* Megahertz */
 #define	PCMCIA_CIS_MEGAHERTZ_XJ4288	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_MEGAHERTZ_XJ4288	0x0023
 #define	PCMCIA_STR_MEGAHERTZ_XJ4288	"Megahertz XJ4288"
@@ -220,7 +227,7 @@
 #define	PCMCIA_PRODUCT_MEGAHERTZ2_XJACK	0x0103
 #define	PCMCIA_STR_MEGAHERTZ2_XJACK	"Megahertz X-JACK"
 
-/* Proxim Products */
+/* Proxim */
 #define	PCMCIA_CIS_PROXIM_ROAMABOUT_2400FH	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_PROXIM_ROAMABOUT_2400FH	0x1058
 #define	PCMCIA_STR_PROXIM_ROAMABOUT_2400FH	"Digital RoamAbout 2400FH"
@@ -228,27 +235,27 @@
 #define	PCMCIA_PRODUCT_PROXIM_RANGELAN2_7401	0x1158
 #define	PCMCIA_STR_PROXIM_RANGELAN2_7401	"Proxim RangeLAN2 7401"
 
-/* Quatech Products */
+/* Quatech */
 #define	PCMCIA_CIS_QUATECH_DSP_225	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_QUATECH_DSP_225	0x0008
 #define	PCMCIA_STR_QUATECH_DSP_225	"Quatech Dual Serial Port"
 
-/* US Robotics Products */
+/* US Robotics */
 #define	PCMCIA_CIS_USROBOTICS_WORLDPORT144	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_USROBOTICS_WORLDPORT144	0x3330
 #define	PCMCIA_STR_USROBOTICS_WORLDPORT144	"US Robotics WorldPort 14.4"
 
-/* Sandisk Products */
+/* Sandisk */
 #define	PCMCIA_CIS_SANDISK_SDCFB	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_SANDISK_SDCFB	0x0401
 #define	PCMCIA_STR_SANDISK_SDCFB	"Sandisk CompactFlash Card"
 
-/* Simple Technology Products */
+/* Simple Technology */
 #define	PCMCIA_CIS_SIMPLETECH_COMMUNICATOR288	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_SIMPLETECH_COMMUNICATOR288	0x0100
 #define	PCMCIA_STR_SIMPLETECH_COMMUNICATOR288	"Simple Technology 28.8 Communicator"
 
-/* Socket Communications Products */
+/* Socket Communications */
 #define	PCMCIA_CIS_SOCKET_PAGECARD	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_SOCKET_PAGECARD	0x0003
 #define	PCMCIA_STR_SOCKET_PAGECARD	"Socket Communications PageCard"
@@ -256,12 +263,12 @@
 #define	PCMCIA_PRODUCT_SOCKET_DUAL_RS232	0x0006
 #define	PCMCIA_STR_SOCKET_DUAL_RS232	"Socket Communications Dual RS232"
 
-/* Symbol Products */
+/* Symbol */
 #define	PCMCIA_CIS_SYMBOL_SPECTRUM24	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_SYMBOL_SPECTRUM24	0x0801
 #define	PCMCIA_STR_SYMBOL_SPECTRUM24	"Spectrum24 WLAN IEEE 802.11 FHSS"
 
-/* TDK Products */
+/* TDK */
 #define	PCMCIA_CIS_TDK_LAK_CD021BX	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_TDK_LAK_CD021BX	0x0200
 #define	PCMCIA_STR_TDK_LAK_CD021BX	"TDK LAK-CD021BX"
@@ -269,7 +276,7 @@
 #define	PCMCIA_PRODUCT_TDK_DFL9610	0x0d0a
 #define	PCMCIA_STR_TDK_DFL9610	"TDK DFL9610"
 
-/* TDK Vendor ID also used by Xircom! */
+/* Xircom */
 #define	PCMCIA_CIS_XIRCOM_XIR_CE_10	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_XIRCOM_XIR_CE_10	0x0108
 #define	PCMCIA_STR_XIRCOM_XIR_CE_10	"Xircom CE10"
@@ -286,7 +293,7 @@
 #define	PCMCIA_PRODUCT_XIRCOM_XIR_CEM_28	0x110b
 #define	PCMCIA_STR_XIRCOM_XIR_CEM_28	"Xircom CEM-28"
 
-/* NewMedia Products */
+/* NewMedia */
 #define	PCMCIA_CIS_NEWMEDIA_BASICS	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_NEWMEDIA_BASICS	0x0019
 #define	PCMCIA_STR_NEWMEDIA_BASICS	"NewMedia BASICS"
@@ -297,7 +304,7 @@
 #define	PCMCIA_PRODUCT_NEWMEDIA_BUSTOASTER	0xc102
 #define	PCMCIA_STR_NEWMEDIA_BUSTOASTER	"NewMedia BusToaster SCSI"
 
-/* Standard Microsystems Corporation Products */
+/* Standard Microsystems Corporation */
 #define	PCMCIA_CIS_SMC_8016	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_SMC_8016	0x0105
 #define	PCMCIA_STR_SMC_8016	"SMC 8016"