Add support for Kingston KNE-PC2.

4 files changed, 34 insertions, 9 deletions

diff --git a/sys/dev/pcmcia/if_ne_pcmcia.c b/sys/dev/pcmcia/if_ne_pcmcia.c
index 3481863c449..3c976c47cb1 100644
--- a/sys/dev/pcmcia/if_ne_pcmcia.c
+++ b/sys/dev/pcmcia/if_ne_pcmcia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ne_pcmcia.c,v 1.6 1999/01/28 04:58:30 fgsch Exp $	*/
+/*	$OpenBSD: if_ne_pcmcia.c,v 1.7 1999/01/31 11:28:39 fgsch Exp $	*/
 /*	$NetBSD: if_ne_pcmcia.c,v 1.17 1998/08/15 19:00:04 thorpej Exp $	*/
 
 /*
@@ -216,6 +216,10 @@ struct ne2000dev {
       PCMCIA_CIS_COMPEX_LINKPORT_ENET_B,
       0, 0xd400, { 0x01, 0x03, 0xdc } },
 
+    { PCMCIA_STR_KINGSTON_KNE_PC2,
+      PCMCIA_VENDOR_KINGSTON, PCMCIA_PRODUCT_KINGSTON_KNE_PC2,
+      PCMCIA_CIS_KINGSTON_KNE_PC2,
+      0, 0x0180, { 0x00, 0xc0, 0xf0 } },
 #if 0
     /* the rest of these are stolen from the linux pcnet pcmcia device
        driver.  Since I don't know the manfid or cis info strings for
@@ -277,9 +281,6 @@ struct ne2000dev {
     { "Kingston KNE-PCM/x",
       0x0000, 0x0000, NULL, NULL, 0,
       0x0ff0, { 0xe2, 0x0c, 0x0f } },
-    { "Kingston KNE-PC2",
-      0x0000, 0x0000, NULL, NULL, 0,
-      0x0180, { 0x00, 0xc0, 0xf0 } },
     { "Longshine LCS-8534",
       0x0000, 0x0000, NULL, NULL, 0,
       0x0000, { 0x08, 0x00, 0x00 } },
diff --git a/sys/dev/pcmcia/pcmciadevs b/sys/dev/pcmcia/pcmciadevs
index f2e7226c1f4..9bb9009dfba 100644
--- a/sys/dev/pcmcia/pcmciadevs
+++ b/sys/dev/pcmcia/pcmciadevs
@@ -1,4 +1,4 @@
-	$OpenBSD: pcmciadevs,v 1.8 1999/01/28 04:58:32 fgsch Exp $
+	$OpenBSD: pcmciadevs,v 1.9 1999/01/31 11:28:39 fgsch Exp $
 /* $NetBSD: pcmciadevs,v 1.13 1998/08/17 23:10:12 thorpej Exp $ */
 
 /*
@@ -54,6 +54,7 @@ vendor COMPAQ			0x0138	Compaq
 vendor LINKSYS			0x0149	Linksys
 vendor SIMPLETECH		0x014d	Simple Technology
 vendor COMPAQ2			0x0183	Compaq
+vendor KINGSTON			0x0186	Kingston
 vendor DAYNA			0x0194	Dayna
 vendor IODATA			0x01bf	I-O DATA
 vendor COMPEX			0x8a01	Compex Corporation
@@ -99,6 +100,9 @@ product IODATA PCLAT		0x2216 I-O DATA PCLA/T
 /* Intel */
 product INTEL EEPRO100		0x010a Intel EtherExpress PRO/100
 
+/* Kingston */
+product KINGSTON KNE_PC2	0x0100 Kingston KNE-PC2
+
 /* Linksys corporation */
 product LINKSYS ECARD_1		0x0265 Linksys EthernetCard or D-Link DE-650
 product LINKSYS COMBO_ECARD	0xc1ab Linksys Combo EthernetCard
diff --git a/sys/dev/pcmcia/pcmciadevs.h b/sys/dev/pcmcia/pcmciadevs.h
index 70f7eac0aaf..a01e5abac37 100644
--- a/sys/dev/pcmcia/pcmciadevs.h
+++ b/sys/dev/pcmcia/pcmciadevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: pcmciadevs.h,v 1.9 1999/01/28 04:58:32 fgsch Exp $	*/
+/*	$OpenBSD: pcmciadevs.h,v 1.10 1999/01/31 11:28:39 fgsch Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *		OpenBSD: pcmciadevs,v 1.7 1998/12/22 02:43:55 niklas Exp 
+ *		OpenBSD: pcmciadevs,v 1.8 1999/01/28 04:58:32 fgsch Exp 
  */
 /* $NetBSD: pcmciadevs,v 1.13 1998/08/17 23:10:12 thorpej Exp $ */
 
@@ -61,6 +61,7 @@
 #define	PCMCIA_VENDOR_LINKSYS	0x0149	/* Linksys */
 #define	PCMCIA_VENDOR_SIMPLETECH	0x014d	/* Simple Technology */
 #define	PCMCIA_VENDOR_COMPAQ2	0x0183	/* Compaq */
+#define	PCMCIA_VENDOR_KINGSTON	0x0186	/* Kingston */
 #define	PCMCIA_VENDOR_DAYNA	0x0194	/* Dayna */
 #define	PCMCIA_VENDOR_IODATA	0x01bf	/* I-O DATA */
 #define	PCMCIA_VENDOR_COMPEX	0x8a01	/* Compex Corporation */
@@ -142,6 +143,11 @@
 #define	PCMCIA_PRODUCT_INTEL_EEPRO100	0x010a
 #define	PCMCIA_STR_INTEL_EEPRO100	"Intel EtherExpress PRO/100"
 
+/* Kingston */
+#define	PCMCIA_CIS_KINGSTON_KNE_PC2	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_KINGSTON_KNE_PC2	0x0100
+#define	PCMCIA_STR_KINGSTON_KNE_PC2	"Kingston KNE-PC2"
+
 /* Linksys corporation */
 #define	PCMCIA_CIS_LINKSYS_ECARD_1	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_LINKSYS_ECARD_1	0x0265
diff --git a/sys/dev/pcmcia/pcmciadevs_data.h b/sys/dev/pcmcia/pcmciadevs_data.h
index 7a4f61589c3..be3c2997c1d 100644
--- a/sys/dev/pcmcia/pcmciadevs_data.h
+++ b/sys/dev/pcmcia/pcmciadevs_data.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: pcmciadevs_data.h,v 1.9 1999/01/28 04:58:32 fgsch Exp $	*/
+/*	$OpenBSD: pcmciadevs_data.h,v 1.10 1999/01/31 11:28:39 fgsch Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *		OpenBSD: pcmciadevs,v 1.7 1998/12/22 02:43:55 niklas Exp 
+ *		OpenBSD: pcmciadevs,v 1.8 1999/01/28 04:58:32 fgsch Exp 
  */
 /* $NetBSD: pcmciadevs,v 1.13 1998/08/17 23:10:12 thorpej Exp $ */
 
@@ -167,6 +167,13 @@ struct pcmcia_knowndev pcmcia_knowndevs[] = {
 	    "Intel EtherExpress PRO/100"	},
 	},
 	{
+	    PCMCIA_VENDOR_KINGSTON, PCMCIA_PRODUCT_KINGSTON_KNE_PC2,
+	    PCMCIA_CIS_KINGSTON_KNE_PC2,
+	    0,
+	    "Kingston",
+	    "Kingston KNE-PC2"	},
+	},
+	{
 	    PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_ECARD_1,
 	    PCMCIA_CIS_LINKSYS_ECARD_1,
 	    0,
@@ -538,6 +545,13 @@ struct pcmcia_knowndev pcmcia_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    PCMCIA_VENDOR_KINGSTON, 0,
+	    PCMCIA_KNOWNDEV_NOPROD,
+	    PCMCIA_CIS_INVALID,
+	    "Kingston",
+	    NULL,
+	},
+	{
 	    PCMCIA_VENDOR_DAYNA, 0,
 	    PCMCIA_KNOWNDEV_NOPROD,
 	    PCMCIA_CIS_INVALID,