sync

1 files changed, 29 insertions, 14 deletions

diff --git a/sys/dev/pcmcia/pcmciadevs.h b/sys/dev/pcmcia/pcmciadevs.h
index 373c5cf9f2c..d4f58457d85 100644
--- a/sys/dev/pcmcia/pcmciadevs.h
+++ b/sys/dev/pcmcia/pcmciadevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: pcmciadevs.h,v 1.38 2000/04/04 20:10:55 mickey Exp $	*/
+/*	$OpenBSD: pcmciadevs.h,v 1.39 2000/04/19 09:18:55 fgsch Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *		OpenBSD: pcmciadevs,v 1.33 2000/04/04 20:09:56 mickey Exp 
+ *		OpenBSD: pcmciadevs,v 1.34 2000/04/19 09:18:15 fgsch Exp 
  */
 /* $NetBSD: pcmciadevs,v 1.13 1998/08/17 23:10:12 thorpej Exp $ */
 
@@ -78,6 +78,7 @@
 #define	PCMCIA_VENDOR_LEXARMEDIA	0x4e01	/* Lexar Media */
 #define	PCMCIA_VENDOR_DUAL	0x890f	/* Dual */
 #define	PCMCIA_VENDOR_COMPEX	0x8a01	/* Compex */
+#define	PCMCIA_VENDOR_MELCO	0x8a01	/* Melco Corporation */
 #define	PCMCIA_VENDOR_CONTEC	0xc001	/* Contec */
 #define	PCMCIA_VENDOR_COREGA	0xc00f	/* Corega K.K. */
 #define	PCMCIA_VENDOR_ALLIEDTELESIS	0xc00f	/* Allied Telesis K.K. */
@@ -228,6 +229,10 @@
 #define	PCMCIA_CIS_MEGAHERTZ2_XJACK	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_MEGAHERTZ2_XJACK	0x0103
 
+/* Melco */
+#define	PCMCIA_CIS_MELCO_LPC3_TX	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_MELCO_LPC3_TX	0xc1ab
+
 /* Motorola */
 #define	PCMCIA_CIS_MOTOROLA_POWER144	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_MOTOROLA_POWER144	0x0105
@@ -328,12 +333,12 @@
 #define	PCMCIA_VENDOR_AMBICOM	-1	/* AmbiCom */
 #define	PCMCIA_VENDOR_EPSON	-1	/* Seiko Epson Corporation */
 #define	PCMCIA_VENDOR_EXP	-1	/* EXP Computer Inc */
-#define	PCMCIA_VENDOR_MELCO	-1	/* Melco Inc */
+#define	PCMCIA_VENDOR_ICOM	-1	/* ICOM Inc */
+#define	PCMCIA_VENDOR_BILLIONTON	-1	/* Billionton Systems Inc. */
+#define	PCMCIA_VENDOR_AMD	-1	/* AMD */
 #define	PCMCIA_VENDOR_EDIMAX	-1	/* Edimax */
 #define	PCMCIA_VENDOR_CNET	-1	/* CNet */
 #define	PCMCIA_VENDOR_SHUTTLE	-1	/* Shuttle */
-#define	PCMCIA_VENDOR_ICOM	-1	/* ICOM Inc */
-#define	PCMCIA_VENDOR_AMD	-1	/* AMD */
 
 #define	PCMCIA_CIS_MEGAHERTZ_XJ2288	{ "MEGAHERTZ", "MODEM XJ2288", NULL, NULL }
 #define	PCMCIA_PRODUCT_MEGAHERTZ_XJ2288	PCMCIA_PRODUCT_INVALID
@@ -342,15 +347,19 @@
 #define	PCMCIA_CIS_PLANET_SMARTCOM2000	{ "PCMCIA", "UE2212", NULL, NULL }
 #define	PCMCIA_PRODUCT_PLANET_SMARTCOM2000	PCMCIA_PRODUCT_INVALID
 /*
- * vendor ID of FNW-3600-T is LINKSYS(0x0149) and product ID is 0xc1ab, but
- * it conflicts with LINKSYS Combo EthernetCard.
+ * vendor ID of both FNW-3600-T and FNW-3700-T is LINKSYS (0x0149) and
+ * product ID is 0xc1ab, but it conflicts with LINKSYS Combo EthernetCard.
  */
 #define	PCMCIA_CIS_PLANEX_FNW3600T	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_PLANEX_FNW3600T	-1
+#define	PCMCIA_CIS_PLANEX_FNW3700T	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_PLANEX_FNW3700T	-1
 #define	PCMCIA_CIS_DLINK_DE650	{ "D-Link", "DE-650", NULL, NULL }
 #define	PCMCIA_PRODUCT_DLINK_DE650	PCMCIA_PRODUCT_INVALID
 #define	PCMCIA_CIS_DLINK_DE660	{ "D-Link", "DE-660", NULL, NULL }
 #define	PCMCIA_PRODUCT_DLINK_DE660	PCMCIA_PRODUCT_INVALID
+#define	PCMCIA_CIS_RPTI_EP400	{ "RPTI LTD.", "EP400", "CISV100", NULL }
+#define	PCMCIA_PRODUCT_RPTI_EP400	PCMCIA_PRODUCT_INVALID
 #define	PCMCIA_CIS_RPTI_EP401	{ "RPTI", "EP401 Ethernet NE2000 Compatible", NULL, NULL }
 #define	PCMCIA_PRODUCT_RPTI_EP401	PCMCIA_PRODUCT_INVALID
 #define	PCMCIA_CIS_ACCTON_EN2212	{ "ACCTON", "EN2212", NULL, NULL }
@@ -369,12 +378,14 @@
 #define	PCMCIA_PRODUCT_COREGA_ETHER_II_PCC_T	PCMCIA_PRODUCT_INVALID
 #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	PCMCIA_PRODUCT_INVALID
+#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	PCMCIA_PRODUCT_INVALID
 #define	PCMCIA_CIS_SVEC_COMBOCARD	{ "Ethernet", "Adapter", NULL, NULL }
 #define	PCMCIA_PRODUCT_SVEC_COMBOCARD	PCMCIA_PRODUCT_INVALID
 #define	PCMCIA_CIS_SVEC_LANCARD	{ "SVEC", "FD605 PCMCIA EtherNet Card", "V1-1", NULL }
 #define	PCMCIA_PRODUCT_SVEC_LANCARD	PCMCIA_PRODUCT_INVALID
 /*
- * vendor ID of PN650TX is LINKSYS(0x0149) and product ID is 0xc1ab, but
+ * vendor ID of PN650TX is LINKSYS (0x0149) and product ID is 0xc1ab, but
  * it conflicts with LINKSYS Combo EthernetCard.
  */
 #define	PCMCIA_CIS_SVEC_PN650TX	{ NULL, NULL, NULL, NULL }
@@ -387,8 +398,16 @@
 #define	PCMCIA_PRODUCT_EPSON_EEN10B	PCMCIA_PRODUCT_INVALID
 #define	PCMCIA_CIS_EXP_EXPMULTIMEDIA	{ "EXP   ", "PnPIDE", "F1", NULL }
 #define	PCMCIA_PRODUCT_EXP_EXPMULTIMEDIA	PCMCIA_PRODUCT_INVALID
-#define	PCMCIA_CIS_MELCO_WLI_PCM	{ "AMD", "Am79C930", NULL, NULL }
-#define	PCMCIA_PRODUCT_MELCO_WLI_PCM	PCMCIA_PRODUCT_INVALID
+#define	PCMCIA_CIS_AMD_AM79C930	{ "AMD", "Am79C930", NULL, NULL }
+#define	PCMCIA_PRODUCT_AMD_AM79C930	PCMCIA_PRODUCT_INVALID
+#define	PCMCIA_CIS_ICOM_SL200	{ "Icom", "SL-200", NULL, NULL }
+#define	PCMCIA_PRODUCT_ICOM_SL200	PCMCIA_PRODUCT_INVALID
+#define	PCMCIA_CIS_XIRCOM_CFE_10	{ "Xircom", "CompactCard Ethernet", "CFE-10", "1.00" }
+#define	PCMCIA_PRODUCT_XIRCOM_CFE_10	PCMCIA_PRODUCT_INVALID
+#define	PCMCIA_CIS_BILLIONTON_LNT10TN	{ "PCMCIA", "LNT-10TN", NULL, NULL }
+#define	PCMCIA_PRODUCT_BILLIONTON_LNT10TN	PCMCIA_PRODUCT_INVALID
+#define	PCMCIA_CIS_NDC_ND5100_E	{ "NDC", "Ethernet", "A", NULL }
+#define	PCMCIA_PRODUCT_NDC_ND5100_E	PCMCIA_PRODUCT_INVALID
 #define	PCMCIA_CIS_PROXIM_RL2_7200	{ "PROXIM", "LAN CARD", "RANGELAN2", NULL }
 #define	PCMCIA_PRODUCT_PROXIM_RL2_7200	PCMCIA_PRODUCT_INVALID
 #define	PCMCIA_CIS_PROXIM_RL2_7400	{ "PROXIM", "LAN PC CARD", "RANGELAN2", NULL }
@@ -401,7 +420,3 @@
 #define	PCMCIA_PRODUCT_CNET_NE2000	PCMCIA_PRODUCT_INVALID
 #define	PCMCIA_CIS_SHUTTLE_IDE_ATAPI	{ "SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", NULL, NULL }
 #define	PCMCIA_PRODUCT_SHUTTLE_IDE_ATAPI	PCMCIA_PRODUCT_INVALID
-#define	PCMCIA_CIS_ICOM_SL200	{ "Icom", "SL-200", NULL, NULL }
-#define	PCMCIA_PRODUCT_ICOM_SL200	PCMCIA_PRODUCT_INVALID
-#define	PCMCIA_CIS_AMD_AM79C930	{ "AMD", "Am79C930", NULL, NULL }
-#define	PCMCIA_PRODUCT_AMD_AM79C930	PCMCIA_PRODUCT_INVALID