[src/netbsd-1-4]: src/sys/dev/pcmcia Pull up revisions 1.23-1.24 (requested b...

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

details:   https://anonhg.NetBSD.org/src/rev/d08dd7be173e
branches:  netbsd-1-4
changeset: 470324:d08dd7be173e
user:      he <he%NetBSD.org@localhost>
date:      Tue Feb 08 22:22:23 2000 +0000

description:
Pull up revisions 1.23-1.24 (requested by enami):
  Add support for 3Com/Megaherz 10/100 Ethernet Modem combined
  card (3CCFEM556BI and 3CXEM556B-INT).  Should fix PR#8331 and
  PR#8188.

diffstat:

 sys/dev/pcmcia/if_ep_pcmcia.c |  34 ++++++++++++++++++++++------------
 1 files changed, 22 insertions(+), 12 deletions(-)

diffs (69 lines):

diff -r bfc57be2fd0c -r d08dd7be173e sys/dev/pcmcia/if_ep_pcmcia.c
--- a/sys/dev/pcmcia/if_ep_pcmcia.c     Tue Feb 08 22:14:27 2000 +0000
+++ b/sys/dev/pcmcia/if_ep_pcmcia.c     Tue Feb 08 22:22:23 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ep_pcmcia.c,v 1.21.2.1 2000/02/06 17:40:32 he Exp $ */
+/*     $NetBSD: if_ep_pcmcia.c,v 1.21.2.2 2000/02/08 22:22:23 he Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -148,23 +148,31 @@
        int             epp_expfunc;    /* expected function */
        const char      *epp_name;      /* device name */
 } ep_pcmcia_products[] = {
-       { PCMCIA_PRODUCT_3COM_3C562,    ELINK_CHIPSET_3C509,
-         0,                            0,
+       { PCMCIA_PRODUCT_3COM_3C562,            ELINK_CHIPSET_3C509,
+         0,                                    0,
          PCMCIA_STR_3COM_3C562 },
-       { PCMCIA_PRODUCT_3COM_3C589,    ELINK_CHIPSET_3C509,
-         0,                            0,
+       { PCMCIA_PRODUCT_3COM_3C589,            ELINK_CHIPSET_3C509,
+         0,                                    0,
          PCMCIA_STR_3COM_3C589 },
 
-       { PCMCIA_PRODUCT_3COM_3CXEM556, ELINK_CHIPSET_3C509,
-         0,                            0,
+       { PCMCIA_PRODUCT_3COM_3CXEM556,         ELINK_CHIPSET_3C509,
+         0,                                    0,
          PCMCIA_STR_3COM_3CXEM556 },
 
-       { PCMCIA_PRODUCT_3COM_3C574,    ELINK_CHIPSET_ROADRUNNER,
-         ELINK_FLAGS_MII,              0,
+       { PCMCIA_PRODUCT_3COM_3CXEM556INT,      ELINK_CHIPSET_3C509,
+         0,                                    0,
+         PCMCIA_STR_3COM_3CXEM556INT },
+
+       { PCMCIA_PRODUCT_3COM_3C574,            ELINK_CHIPSET_ROADRUNNER,
+         ELINK_FLAGS_MII,                      0,
          PCMCIA_STR_3COM_3C574 },
 
-       { 0,                            0,
-         0,                            0,
+       { PCMCIA_PRODUCT_3COM_3CCFEM556BI,      ELINK_CHIPSET_ROADRUNNER,
+         ELINK_FLAGS_MII,                      0,
+         PCMCIA_STR_3COM_3CCFEM556BI },
+
+       { 0,                                    0,
+         0,                                    0,
          NULL },
 };
 
@@ -231,7 +239,8 @@
                return (ret);
 
        if ((psc->sc_pf->sc->card.product == PCMCIA_PRODUCT_3COM_3C562) ||
-           (psc->sc_pf->sc->card.product == PCMCIA_PRODUCT_3COM_3CXEM556)) {
+           (psc->sc_pf->sc->card.product == PCMCIA_PRODUCT_3COM_3CXEM556) ||
+           (psc->sc_pf->sc->card.product == PCMCIA_PRODUCT_3COM_3CXEM556INT)) {
                int reg;
 
                /* turn off the serial-disable bit */
@@ -341,6 +350,7 @@
                 */
                /* FALLTHROUGH */
        case PCMCIA_PRODUCT_3COM_3C574:
+       case PCMCIA_PRODUCT_3COM_3CCFEM556BI:
                /*
                 * Apparently, some 3c574s do it this way, as well.
                 */