1000baseTX -> 1000baseT

- More technically correct
- Matches FreeBSD and NetBSD
- Preserved #define for 1000baseTX for backwards compatibility
ok jason@

4 files changed, 18 insertions, 18 deletions

diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c
index e0cbe03f9a5..272e91b2194 100644
--- a/sys/dev/mii/brgphy.c
+++ b/sys/dev/mii/brgphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: brgphy.c,v 1.13 2002/11/26 04:37:47 jason Exp $	*/
+/*	$OpenBSD: brgphy.c,v 1.14 2002/11/26 06:01:28 nate Exp $	*/
 
 /*
  * Copyright (c) 2000
@@ -195,7 +195,7 @@ brgphy_service(sc, mii, cmd)
 #endif
 			(void) brgphy_mii_phy_auto(sc, 1);
 			break;
-		case IFM_1000_TX:
+		case IFM_1000_T:
 			speed = BRGPHY_S1000;
 			goto setit;
 		case IFM_100_T4:
@@ -215,7 +215,7 @@ brgphy_service(sc, mii, cmd)
 			}
 			PHY_WRITE(sc, BRGPHY_MII_ANAR, BRGPHY_SEL_TYPE);
 
-			if (IFM_SUBTYPE(ife->ifm_media) != IFM_1000_TX)
+			if (IFM_SUBTYPE(ife->ifm_media) != IFM_1000_T)
 				break;
 
 			/*
@@ -320,10 +320,10 @@ brgphy_status(sc)
 		switch (PHY_READ(sc, BRGPHY_MII_AUXSTS) &
 			BRGPHY_AUXSTS_AN_RES) {
 		case BRGPHY_RES_1000FD:
-			mii->mii_media_active |= IFM_1000_TX | IFM_FDX;
+			mii->mii_media_active |= IFM_1000_T | IFM_FDX;
 			break;
 		case BRGPHY_RES_1000HD:
-			mii->mii_media_active |= IFM_1000_TX | IFM_HDX;
+			mii->mii_media_active |= IFM_1000_T | IFM_HDX;
 			break;
 		case BRGPHY_RES_100FD:
 			mii->mii_media_active |= IFM_100_TX | IFM_FDX;
diff --git a/sys/dev/mii/eephy.c b/sys/dev/mii/eephy.c
index 64ce3c1e7e3..8e8975819fc 100644
--- a/sys/dev/mii/eephy.c
+++ b/sys/dev/mii/eephy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: eephy.c,v 1.7 2002/05/04 11:30:06 fgsch Exp $	*/
+/*	$OpenBSD: eephy.c,v 1.8 2002/11/26 06:01:28 nate Exp $	*/
 /*
  * Principal Author: Parag Patel
  * Copyright (c) 2001
@@ -130,12 +130,12 @@ eephyattach(struct device *parent, struct device *self, void *aux)
 #ifndef __OpenBSD__
 	printf("%s: ", sc->mii_dev.dv_xname);
 #endif
-	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),
 			E1000_CR_SPEED_1000 | E1000_CR_FULL_DUPLEX);
 	PRINT("1000baseTX-FDX");
 	/*
 	TODO - apparently 1000BT-simplex not supported?
-	ADD(IFM_MAKEWORD(IFM_ETHER, IFM_1000_TX, 0, sc->mii_inst),
+	ADD(IFM_MAKEWORD(IFM_ETHER, IFM_1000_T, 0, sc->mii_inst),
 			E1000_CR_SPEED_1000);
 	PRINT("1000baseTX");
 	*/
@@ -249,7 +249,7 @@ eephy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
 			(void)eephy_mii_phy_auto(sc, 1);
 			break;
 
-		case IFM_1000_TX:
+		case IFM_1000_T:
 			if (sc->mii_flags & MIIF_DOINGAUTO)
 				return (0);
 
@@ -382,7 +382,7 @@ eephy_status(struct mii_softc *sc)
 	}
 
 	if (ssr & E1000_SSR_1000MBS)
-		mii->mii_media_active |= IFM_1000_TX;
+		mii->mii_media_active |= IFM_1000_T;
 	else if (ssr & E1000_SSR_100MBS)
 		mii->mii_media_active |= IFM_100_TX;
 	else
diff --git a/sys/dev/mii/mii_physubr.c b/sys/dev/mii/mii_physubr.c
index 320b40e1b62..f39a714be41 100644
--- a/sys/dev/mii/mii_physubr.c
+++ b/sys/dev/mii/mii_physubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mii_physubr.c,v 1.13 2002/05/04 11:30:06 fgsch Exp $	*/
+/*	$OpenBSD: mii_physubr.c,v 1.14 2002/11/26 06:01:28 nate Exp $	*/
 /*	$NetBSD: mii_physubr.c,v 1.20 2001/04/13 23:30:09 thorpej Exp $	*/
 
 /*-
@@ -377,12 +377,12 @@ mii_phy_add_media(sc)
 		}
 		if (sc->mii_extcapabilities & EXTSR_1000THDX) {
 			sc->mii_anegticks = 10;
-			ADD(IFM_MAKEWORD(IFM_ETHER, IFM_1000_TX, 0,
+			ADD(IFM_MAKEWORD(IFM_ETHER, IFM_1000_T, 0,
 			    sc->mii_inst), MII_MEDIA_1000_T);
 		}
 		if (sc->mii_extcapabilities & EXTSR_1000TFDX) {
 			sc->mii_anegticks = 10;
-			ADD(IFM_MAKEWORD(IFM_ETHER, IFM_1000_TX, IFM_FDX,
+			ADD(IFM_MAKEWORD(IFM_ETHER, IFM_1000_T, IFM_FDX,
 			    sc->mii_inst), MII_MEDIA_1000_T_FDX);
 		}
 	}
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;