D-Link DE-650 has many minor versions. Be sure to use the correct one.

4 files changed, 32 insertions, 19 deletions

diff --git a/sys/dev/pcmcia/if_ne_pcmcia.c b/sys/dev/pcmcia/if_ne_pcmcia.c
index 16c678e7af5..4f26ea70e7c 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.2 1998/10/14 07:34:43 fgsch Exp $	*/
+/*	$OpenBSD: if_ne_pcmcia.c,v 1.3 1998/11/05 09:12:52 fgsch Exp $	*/
 /*	$NetBSD: if_ne_pcmcia.c,v 1.17 1998/08/15 19:00:04 thorpej Exp $	*/
 
 /*
@@ -104,11 +104,6 @@ struct ne2000dev {
       PCMCIA_CIS_PLANET_SMARTCOM2000,
       0, 0xff0, { 0x00, 0x00, 0xe8 } },
 
-    { PCMCIA_STR_DLINK_DE650,
-      PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
-      PCMCIA_CIS_DLINK_DE650,
-      0, 0x0040, { 0x00, 0x80, 0xc8 } },
-
     { PCMCIA_STR_DLINK_DE660,
       PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
       PCMCIA_CIS_DLINK_DE660,
@@ -125,6 +120,29 @@ struct ne2000dev {
       0, 0x0ff0, { 0x00, 0x00, 0xe8 } },
 
     /*
+     * D-Link DE-650 has many minor versions:
+     *
+     *   CIS information          Manufacturer Product  Note
+     * 1 "D-Link, DE-650"             INVALID  INVALID  white card
+     * 2 "D-Link, DE-650, Ver 01.00"  INVALID  INVALID  became bare metal
+     * 3 "D-Link, DE-650, Ver 01.00"   0x149    0x265   minor change in look
+     * 4 "D-Link, DE-650, Ver 01.00"   0x149    0x265   collision LED added
+     *
+     * While the 1st and the 2nd types should use the "D-Link DE-650" entry,
+     * the 3rd and the 4th types should use the "Linksys EtherCard" entry.
+     * Therefore, the Linksys entry should be before the D-Link.  --itohy
+     */
+    { PCMCIA_STR_LINKSYS_ECARD_1, 
+      PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_ECARD_1,
+      PCMCIA_CIS_LINKSYS_ECARD_1, 
+      0, -1, { 0x00, 0x80, 0xc8 } },
+
+    { PCMCIA_STR_DLINK_DE650,
+      PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
+      PCMCIA_CIS_DLINK_DE650,
+      0, 0x0040, { 0x00, 0x80, 0xc8 } },
+
+    /*
      * You have to add new entries which contains
      * PCMCIA_VENDOR_INVALID and/or PCMCIA_PRODUCT_INVALID 
      * in front of this comment.
@@ -140,11 +158,6 @@ struct ne2000dev {
       PCMCIA_CIS_IBM_INFOMOVER,
       0, 0x0ff0, { 0x08, 0x00, 0x5a } },
 
-    { PCMCIA_STR_LINKSYS_ECARD_1, 
-      PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_ECARD_1,
-      PCMCIA_CIS_LINKSYS_ECARD_1, 
-      0, -1, { 0x00, 0x80, 0xc8 } },
-
     { PCMCIA_STR_LINKSYS_COMBO_ECARD, 
       PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_COMBO_ECARD,
       PCMCIA_CIS_LINKSYS_COMBO_ECARD, 
diff --git a/sys/dev/pcmcia/pcmciadevs b/sys/dev/pcmcia/pcmciadevs
index ae86b670132..a814dc7cb96 100644
--- a/sys/dev/pcmcia/pcmciadevs
+++ b/sys/dev/pcmcia/pcmciadevs
@@ -1,4 +1,4 @@
-	$OpenBSD: pcmciadevs,v 1.4 1998/10/14 07:34:43 fgsch Exp $
+	$OpenBSD: pcmciadevs,v 1.5 1998/11/05 09:12:52 fgsch Exp $
 /* $NetBSD: pcmciadevs,v 1.13 1998/08/17 23:10:12 thorpej Exp $ */
 
 /*
@@ -86,7 +86,7 @@ product IBM HOME_AND_AWAY	0x002e IBM Home and Away Modem
 product IODATA PCLAT		0x2216 I-O DATA PCLA/T
 
 /* Linksys corporation */
-product LINKSYS ECARD_1		0x0265 Linksys EthernetCard
+product LINKSYS ECARD_1		0x0265 Linksys EthernetCard or D-Link DE-650
 product LINKSYS COMBO_ECARD	0xc1ab Linksys Combo EthernetCard
 product LINKSYS TRUST_COMBO_ECARD 0x021b Trust (Linksys) Combo EthernetCard
 
diff --git a/sys/dev/pcmcia/pcmciadevs.h b/sys/dev/pcmcia/pcmciadevs.h
index fe894c36ef6..8e29803e1c7 100644
--- a/sys/dev/pcmcia/pcmciadevs.h
+++ b/sys/dev/pcmcia/pcmciadevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: pcmciadevs.h,v 1.5 1998/10/14 07:34:43 fgsch Exp $	*/
+/*	$OpenBSD: pcmciadevs.h,v 1.6 1998/11/05 09:12:52 fgsch Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *		OpenBSD: pcmciadevs,v 1.3 1998/09/14 19:21:15 deraadt Exp 
+ *		OpenBSD: pcmciadevs,v 1.4 1998/10/14 07:34:43 fgsch Exp 
  */
 /* $NetBSD: pcmciadevs,v 1.13 1998/08/17 23:10:12 thorpej Exp $ */
 
@@ -123,7 +123,7 @@
 /* Linksys corporation */
 #define	PCMCIA_CIS_LINKSYS_ECARD_1	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_LINKSYS_ECARD_1	0x0265
-#define	PCMCIA_STR_LINKSYS_ECARD_1	"Linksys EthernetCard"
+#define	PCMCIA_STR_LINKSYS_ECARD_1	"Linksys EthernetCard or D-Link DE-650"
 #define	PCMCIA_CIS_LINKSYS_COMBO_ECARD	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_LINKSYS_COMBO_ECARD	0xc1ab
 #define	PCMCIA_STR_LINKSYS_COMBO_ECARD	"Linksys Combo EthernetCard"
diff --git a/sys/dev/pcmcia/pcmciadevs_data.h b/sys/dev/pcmcia/pcmciadevs_data.h
index 33ecf458804..4af1fe48ba5 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.5 1998/10/14 07:34:43 fgsch Exp $	*/
+/*	$OpenBSD: pcmciadevs_data.h,v 1.6 1998/11/05 09:12:52 fgsch Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *		OpenBSD: pcmciadevs,v 1.3 1998/09/14 19:21:15 deraadt Exp 
+ *		OpenBSD: pcmciadevs,v 1.4 1998/10/14 07:34:43 fgsch Exp 
  */
 /* $NetBSD: pcmciadevs,v 1.13 1998/08/17 23:10:12 thorpej Exp $ */
 
@@ -143,7 +143,7 @@ struct pcmcia_knowndev pcmcia_knowndevs[] = {
 	    PCMCIA_CIS_LINKSYS_ECARD_1,
 	    0,
 	    "Linksys",
-	    "Linksys EthernetCard"	},
+	    "Linksys EthernetCard or D-Link DE-650"	},
 	},
 	{
 	    PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_COMBO_ECARD,