summaryrefslogtreecommitdiff
path: root/sys/dev/pcmcia/if_ne_pcmcia.c
diff options
context:
space:
mode:
authorFederico G. Schwindt <fgsch@cvs.openbsd.org>1998-11-05 09:12:53 +0000
committerFederico G. Schwindt <fgsch@cvs.openbsd.org>1998-11-05 09:12:53 +0000
commit49425a404c082ede109f479ff4b9272299f50186 (patch)
tree43b14a6595257d924793cb48c09be1982ccde754 /sys/dev/pcmcia/if_ne_pcmcia.c
parente5553154f7b34bbec40fe04a821df208638ff540 (diff)
D-Link DE-650 has many minor versions. Be sure to use the correct one.
Diffstat (limited to 'sys/dev/pcmcia/if_ne_pcmcia.c')
-rw-r--r--sys/dev/pcmcia/if_ne_pcmcia.c35
1 files changed, 24 insertions, 11 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,