From e67296b3b06948c8abac60000a1a1b3fd9d271f7 Mon Sep 17 00:00:00 2001 From: phk Date: Sun, 28 Apr 2002 20:34:20 +0000 Subject: Follow NetBSD and s/IFM_1000_TX/IFM_1000_T/ --- sys/dev/mii/nsgphy.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'sys/dev/mii/nsgphy.c') diff --git a/sys/dev/mii/nsgphy.c b/sys/dev/mii/nsgphy.c index 57ff861..2f4cad6 100644 --- a/sys/dev/mii/nsgphy.c +++ b/sys/dev/mii/nsgphy.c @@ -156,10 +156,10 @@ nsgphy_attach(device_t dev) mii_phy_reset(sc); device_printf(dev, " "); - ADD(IFM_MAKEWORD(IFM_ETHER, IFM_1000_TX, IFM_FDX, sc->mii_inst), + ADD(IFM_MAKEWORD(IFM_ETHER, IFM_1000_T, IFM_FDX, sc->mii_inst), BMCR_S1000|BMCR_FDX); PRINT("1000baseTX-FDX"); - ADD(IFM_MAKEWORD(IFM_ETHER, IFM_1000_TX, 0, sc->mii_inst), + ADD(IFM_MAKEWORD(IFM_ETHER, IFM_1000_T, 0, sc->mii_inst), BMCR_S1000); PRINT("1000baseTX"); sc->mii_capabilities = @@ -245,7 +245,7 @@ nsgphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) #endif (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, MII_BMCR, BMCR_FDX|BMCR_SPEED1); @@ -373,9 +373,9 @@ nsgphy_status(struct mii_softc *sc) anlpar = PHY_READ(sc, MII_ANLPAR); gstat = PHY_READ(sc, MII_100T2SR); if (gstat & GTSR_LP_1000TFDX) - mii->mii_media_active |= IFM_1000_TX|IFM_FDX; + mii->mii_media_active |= IFM_1000_T|IFM_FDX; else if (gstat & GTSR_LP_1000THDX) - mii->mii_media_active |= IFM_1000_TX|IFM_HDX; + mii->mii_media_active |= IFM_1000_T|IFM_HDX; else if (anlpar & ANLPAR_T4) mii->mii_media_active |= IFM_100_T4; else if (anlpar & ANLPAR_TX_FD) @@ -393,7 +393,7 @@ nsgphy_status(struct mii_softc *sc) switch(bmcr & (BMCR_SPEED1|BMCR_SPEED0)) { case BMCR_S1000: - mii->mii_media_active |= IFM_1000_TX; + mii->mii_media_active |= IFM_1000_T; break; case BMCR_S100: mii->mii_media_active |= IFM_100_TX; -- cgit v1.1