[src/netbsd-1-4]: src/sys/dev/pci Pull up revision 1.3 (requested by he):

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

details:   https://anonhg.NetBSD.org/src/rev/6194b18822af
branches:  netbsd-1-4
changeset: 470743:6194b18822af
user:      he <he%NetBSD.org@localhost>
date:      Thu Jul 06 10:42:25 2000 +0000

description:
Pull up revision 1.3 (requested by he):
  Make the ti(4) driver compile again after the wi(4) related
  pullups of if_media.h changed IFM_1000_FX to IFM_1000_SX.

diffstat:

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

diffs (47 lines):

diff -r 63d074fbaf4a -r 6194b18822af sys/dev/pci/if_ti.c
--- a/sys/dev/pci/if_ti.c       Thu Jul 06 10:40:34 2000 +0000
+++ b/sys/dev/pci/if_ti.c       Thu Jul 06 10:42:25 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ti.c,v 1.1.2.5 2000/06/01 18:04:43 he Exp $ */
+/* $NetBSD: if_ti.c,v 1.1.2.6 2000/07/06 10:42:25 he 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.
  */
@@ -1810,8 +1810,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);
 
@@ -2392,7 +2392,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);
@@ -2441,7 +2441,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);