Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev Add chip types for several more Tulip clones (ASIX, ...



details:   https://anonhg.NetBSD.org/src/rev/3dce2c925d5d
branches:  trunk
changeset: 476182:3dce2c925d5d
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed Sep 08 22:29:46 1999 +0000

description:
Add chip types for several more Tulip clones (ASIX, ADMtex, PNIC II, Davicom),
and match the Compex RL100-ATX; it uses the Winbond 89C840F (RL100-TX is
a Macronix 98713).

diffstat:

 sys/dev/ic/tulipvar.h    |  22 ++++++++++++++++------
 sys/dev/pci/if_tlp_pci.c |  32 +++++++++++++++++++++++++++++++-
 2 files changed, 47 insertions(+), 7 deletions(-)

diffs (109 lines):

diff -r 1d166f699999 -r 3dce2c925d5d sys/dev/ic/tulipvar.h
--- a/sys/dev/ic/tulipvar.h     Wed Sep 08 22:25:56 1999 +0000
+++ b/sys/dev/ic/tulipvar.h     Wed Sep 08 22:29:46 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tulipvar.h,v 1.4 1999/09/02 23:25:29 thorpej Exp $     */
+/*     $NetBSD: tulipvar.h,v 1.5 1999/09/08 22:29:46 thorpej Exp $     */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -136,11 +136,16 @@
        TULIP_CHIP_21143     = 7,       /* DECchip 21143 */
        TULIP_CHIP_82C168    = 8,       /* Lite-On 82C168 PNIC */
        TULIP_CHIP_82C169    = 9,       /* Lite-On 82C169 PNIC */
-       TULIP_CHIP_MX98713   = 10,      /* Macronix 98713 PMAC */
-       TULIP_CHIP_MX98713A  = 11,      /* Macronix 98713A PMAC */
-       TULIP_CHIP_MX98715   = 12,      /* Macronix 98715, 98715A PMAC */
-       TULIP_CHIP_MX98725   = 13,      /* Macronix 98725 PMAC */
-       TULIP_CHIP_WB89C840F = 14,      /* Winbond 89C840F */
+       TULIP_CHIP_82C115    = 10,      /* Lite-On 82C115 PNIC II */
+       TULIP_CHIP_MX98713   = 11,      /* Macronix 98713 PMAC */
+       TULIP_CHIP_MX98713A  = 12,      /* Macronix 98713A PMAC */
+       TULIP_CHIP_MX98715   = 13,      /* Macronix 98715, 98715A PMAC */
+       TULIP_CHIP_MX98725   = 14,      /* Macronix 98725 PMAC */
+       TULIP_CHIP_WB89C840F = 15,      /* Winbond 89C840F */
+       TULIP_CHIP_DM9102    = 16,      /* Davicom DM9102 */
+       TULIP_CHIP_AL981     = 17,      /* ADMtek AL981 */
+       TULIP_CHIP_AX88140   = 18,      /* ASIX AX88140 */
+       TULIP_CHIP_AX88141   = 19,      /* ASIX AX88141 */
 } tulip_chip_t;
 
 #define        TULIP_CHIP_NAMES                                                \
@@ -155,11 +160,16 @@
        "DECchip 21143",                                                \
        "Lite-On 82C168",                                               \
        "Lite-On 82C169",                                               \
+       "Lite-On 82C115",                                               \
        "Macronix MX98713",                                             \
        "Macronix MX98713A",                                            \
        "Macronix MX98715",                                             \
        "Macronix MX98725",                                             \
        "Winbond 89C840F",                                              \
+       "Davicom DM9102",                                               \
+       "ADMtek AL981",                                                 \
+       "ASIX AX88140",                                                 \
+       "ASIX AX88141",                                                 \
 }
 
 struct tulip_softc;
diff -r 1d166f699999 -r 3dce2c925d5d sys/dev/pci/if_tlp_pci.c
--- a/sys/dev/pci/if_tlp_pci.c  Wed Sep 08 22:25:56 1999 +0000
+++ b/sys/dev/pci/if_tlp_pci.c  Wed Sep 08 22:29:46 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_tlp_pci.c,v 1.3 1999/09/08 21:42:44 thorpej Exp $   */
+/*     $NetBSD: if_tlp_pci.c,v 1.4 1999/09/08 22:29:47 thorpej Exp $   */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -127,14 +127,39 @@
          TULIP_CHIP_82C168 },
 
 #if 0
+       /*
+        * Note: This is like a MX98715A with Wake-On-LAN and a
+        * 128-bit multicast hash table.
+        */
+       { PCI_VENDOR_LITEON,            PCI_PRODUCT_LITEON_82C115,
+         TULIP_CHIP_82C115 },
+#endif
+
+#if 0
        { PCI_VENDOR_MACRONIX,          PCI_PRODUCT_MACRONIX_MX98713,
          TULIP_CHIP_MX98713 },
        { PCI_VENDOR_MACRONIX,          PCI_PRODUCT_MACRONIX_MX987x5,
          TULIP_CHIP_MX98715 },
+
+       { PCI_VENDOR_COMPEX,            PCI_PRODUCT_COMPEX_RL100TX,
+         TULIP_CHIP_MX98713 },
 #endif
 
        { PCI_VENDOR_WINBOND,           PCI_PRODUCT_WINBOND_W89C840F,
          TULIP_CHIP_WB89C840F },
+       { PCI_VENDOR_COMPEX,            PCI_PRODUCT_COMPEX_RL100ATX,
+         TULIP_CHIP_WB89C840F },
+
+#if 0
+       { PCI_VENDOR_DAVICOM,           PCI_PRODUCT_DAVICOM_DM9102,
+         TULIP_CHIP_DM9102 },
+
+       { PCI_VENDOR_ADMTEK,            PCI_PRODUCT_ADMTEK_AL981,
+         TULIP_CHIP_AL981 },
+
+       { PCI_VENDOR_ASIX,              PCI_PRODUCT_ASIX_AX88140A,
+         TULIP_CHIP_AX88140 },
+#endif
 
        { 0,                            0,
          TULIP_CHIP_INVALID },
@@ -258,6 +283,11 @@
                sc->sc_regshift = 1;
                break;
 
+       case TULIP_CHIP_AX88140:
+               if (sc->sc_rev >= 0x10)
+                       sc->sc_chip = TULIP_CHIP_AX88141;
+               break;
+
        default:
                /* Nothing. */
        }



Home | Main Index | Thread Index | Old Index