[src/netbsd-1-6]: src/sys/dev/pcmcia Pull up revision 1.93 (requested by jona...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/aeff3648a477
branches:  netbsd-1-6
changeset: 527865:aeff3648a477
user:      lukem <lukem%NetBSD.org@localhost>
date:      Tue Jun 11 01:45:56 2002 +0000

description:
Pull up revision 1.93 (requested by jonathan in ticket #146):
Add support for the D-Link DFE-670TXD pcmcia card.

diffstat:

 sys/dev/pcmcia/if_ne_pcmcia.c |  17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diffs (52 lines):

diff -r d2a2959c9aec -r aeff3648a477 sys/dev/pcmcia/if_ne_pcmcia.c
--- a/sys/dev/pcmcia/if_ne_pcmcia.c     Tue Jun 11 01:45:26 2002 +0000
+++ b/sys/dev/pcmcia/if_ne_pcmcia.c     Tue Jun 11 01:45:56 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ne_pcmcia.c,v 1.90 2002/05/08 18:18:55 chris Exp $  */
+/*     $NetBSD: if_ne_pcmcia.c,v 1.90.4.1 2002/06/11 01:45:56 lukem Exp $      */
 
 /*
  * Copyright (c) 1997 Marc Horowitz.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ne_pcmcia.c,v 1.90 2002/05/08 18:18:55 chris Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_pcmcia.c,v 1.90.4.1 2002/06/11 01:45:56 lukem Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -274,6 +274,11 @@
       PCMCIA_CIS_DLINK_DE650,
       0, -1, { 0x00, 0xe0, 0x98 }, NE2000DVF_DL10019 },
 
+    { PCMCIA_STR_DLINK_DFE670TXD,
+      PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_NETGEAR_FA410TXC,
+      PCMCIA_CIS_DLINK_DFE670TXD,
+      0, -1, { 0x00, 0x50, 0xba }, NE2000DVF_DL10019 },
+
     { PCMCIA_STR_MELCO_LPC2_TX,
       PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_ETHERFAST,
       PCMCIA_CIS_MELCO_LPC2_TX,
@@ -696,6 +701,7 @@
        i = 0;
 again:
        enaddr = NULL;                  /* Ask ASIC by default */
+       typestr = "";                   /* clear previous card-type */
        for (; i < NE2000_NDEVS; i++) {
                ne_dev = ne2000_match(pa->card, pa->pf->number, i);
                if (ne_dev != NULL) {
@@ -709,8 +715,11 @@
                }
        }
        if (i == NE2000_NDEVS) {
-               printf("%s: can't match ethernet vendor code\n",
-                   dsc->sc_dev.dv_xname);
+               printf("%s (manf %08x prod %08x) cis %s %s: "
+                      "can't match ethernet vendor code\n",
+                      dsc->sc_dev.dv_xname,
+                      pa->manufacturer, pa->product,
+                      pa->card->cis1_info[0], pa->card->cis1_info[1]);
                goto fail_5;
        }