diff options
author | Nathan Binkert <nate@cvs.openbsd.org> | 2002-11-26 06:01:29 +0000 |
---|---|---|
committer | Nathan Binkert <nate@cvs.openbsd.org> | 2002-11-26 06:01:29 +0000 |
commit | 6305f12c83ebd24f17abde19361cfec044ac75a7 (patch) | |
tree | 08b5799abbee81cbb004b151ad789ed837bd781f /sys/dev/mii/nsgphy.c | |
parent | b2b15e45eca7137f0e7fb63a1de580af95881196 (diff) |
1000baseTX -> 1000baseT
- More technically correct
- Matches FreeBSD and NetBSD
- Preserved #define for 1000baseTX for backwards compatibility
ok jason@
Diffstat (limited to 'sys/dev/mii/nsgphy.c')
-rw-r--r-- | sys/dev/mii/nsgphy.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/mii/nsgphy.c b/sys/dev/mii/nsgphy.c index ff7504e661a..53aad5d1a73 100644 --- a/sys/dev/mii/nsgphy.c +++ b/sys/dev/mii/nsgphy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nsgphy.c,v 1.8 2002/05/04 11:30:06 fgsch Exp $ */ +/* $OpenBSD: nsgphy.c,v 1.9 2002/11/26 06:01:28 nate Exp $ */ /* * Copyright (c) 2001 Wind River Systems * Copyright (c) 2001 @@ -191,7 +191,7 @@ nsgphy_service(sc, mii, cmd) case IFM_AUTO: (void) nsgphy_mii_phy_auto(sc, 0); break; - case IFM_1000_TX: + case IFM_1000_T: if ((ife->ifm_media & IFM_GMASK) == IFM_FDX) { PHY_WRITE(sc, NSGPHY_MII_BMCR, NSGPHY_BMCR_FDX|NSGPHY_BMCR_SPD1); @@ -316,9 +316,9 @@ nsgphy_status(sc) anlpar = PHY_READ(sc, NSGPHY_MII_ANLPAR); gstat = PHY_READ(sc, NSGPHY_MII_1000STS); if (gstat & NSGPHY_1000STS_LPFD) - mii->mii_media_active |= IFM_1000_TX|IFM_FDX; + mii->mii_media_active |= IFM_1000_T|IFM_FDX; else if (gstat & NSGPHY_1000STS_LPHD) - mii->mii_media_active |= IFM_1000_TX|IFM_HDX; + mii->mii_media_active |= IFM_1000_T|IFM_HDX; else if (anlpar & NSGPHY_ANLPAR_100T4) mii->mii_media_active |= IFM_100_T4; else if (anlpar & NSGPHY_ANLPAR_100FDX) @@ -336,7 +336,7 @@ nsgphy_status(sc) switch(bmcr & (NSGPHY_BMCR_SPD1|NSGPHY_BMCR_SPD0)) { case NSGPHY_S1000: - mii->mii_media_active |= IFM_1000_TX; + mii->mii_media_active |= IFM_1000_T; break; case NSGPHY_S100: mii->mii_media_active |= IFM_100_TX; |