Source-Changes-HG archive

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

[src/trunk]: src/sys/dev/pci IFM_1000_FX -> IFM_1000_SX



details:   https://anonhg.NetBSD.org/src/rev/46609c7c7f8a
branches:  trunk
changeset: 481297:46609c7c7f8a
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Tue Jan 25 20:19:14 2000 +0000

description:
IFM_1000_FX -> IFM_1000_SX

diffstat:

 sys/dev/pci/if_ti.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (47 lines):

diff -r 1bdfe0350ad4 -r 46609c7c7f8a sys/dev/pci/if_ti.c
--- a/sys/dev/pci/if_ti.c       Tue Jan 25 20:18:52 2000 +0000
+++ b/sys/dev/pci/if_ti.c       Tue Jan 25 20:19:14 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ti.c,v 1.2 1999/10/06 11:23:33 drochner Exp $ */
+/* $NetBSD: if_ti.c,v 1.3 2000/01/25 20:19:14 thorpej Exp $ */
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -75,7 +75,7 @@
  *   for testing
  * - Raymond Lee of Netgear, for providing a pair of Netgear
  *   GA620 Tigon 2 boards for testing
- * - Ulf Zimmermann, for bringing the GA260 to my attention and
+ * - Ulf Zimmermann, for bringing the GA620 to my attention and
  *   convincing me to write this driver.
  * - Andrew Gallatin for providing FreeBSD/Alpha support.
  */
@@ -1883,8 +1883,8 @@
        ifmedia_add(&sc->ifmedia, IFM_ETHER|IFM_10_FL|IFM_FDX, 0, NULL);
        ifmedia_add(&sc->ifmedia, IFM_ETHER|IFM_100_FX, 0, NULL);
        ifmedia_add(&sc->ifmedia, IFM_ETHER|IFM_100_FX|IFM_FDX, 0, NULL);
-       ifmedia_add(&sc->ifmedia, IFM_ETHER|IFM_1000_FX, 0, NULL);
-       ifmedia_add(&sc->ifmedia, IFM_ETHER|IFM_1000_FX|IFM_FDX, 0, NULL);
+       ifmedia_add(&sc->ifmedia, IFM_ETHER|IFM_1000_SX, 0, NULL);
+       ifmedia_add(&sc->ifmedia, IFM_ETHER|IFM_1000_SX|IFM_FDX, 0, NULL);
        ifmedia_add(&sc->ifmedia, IFM_ETHER|IFM_AUTO, 0, NULL);
        ifmedia_set(&sc->ifmedia, IFM_ETHER|IFM_AUTO);
 
@@ -2489,7 +2489,7 @@
                TI_DO_CMD(TI_CMD_LINK_NEGOTIATION,
                    TI_CMD_CODE_NEGOTIATE_BOTH, 0);
                break;
-       case IFM_1000_FX:
+       case IFM_1000_SX:
                CSR_WRITE_4(sc, TI_GCR_GLINK, TI_GLNK_PREF|TI_GLNK_1000MB|
                    TI_GLNK_FULL_DUPLEX|TI_GLNK_RX_FLOWCTL_Y|TI_GLNK_ENB);
                CSR_WRITE_4(sc, TI_GCR_LINK, 0);
@@ -2538,7 +2538,7 @@
        ifmr->ifm_status |= IFM_ACTIVE;
 
        if (sc->ti_linkstat == TI_EV_CODE_GIG_LINK_UP)
-               ifmr->ifm_active |= IFM_1000_FX|IFM_FDX;
+               ifmr->ifm_active |= IFM_1000_SX|IFM_FDX;
        else if (sc->ti_linkstat == TI_EV_CODE_LINK_UP) {
                u_int32_t               media;
                media = CSR_READ_4(sc, TI_GCR_LINK_STAT);



Home | Main Index | Thread Index | Old Index