From 9bbc5585e4a14412240341b0b0372e13e17faf6e Mon Sep 17 00:00:00 2001 From: Hasso Tepper Date: Sun, 16 Mar 2008 15:50:22 +0000 Subject: [PATCH] 10Base-TX -> 10Base-T and 1000Base-TX -> 1000Base-T. Although 1000Base-TX standard itself even exists, there is no commercial products AFAIK. --- share/man/man4/bge.4 | 18 +++++++++--------- share/man/man4/msk.4 | 10 +++++----- share/man/man4/nge.4 | 10 +++++----- share/man/man4/re.4 | 6 +++--- share/man/man4/sk.4 | 10 +++++----- share/man/man4/vge.4 | 10 +++++----- sys/dev/netif/em/README | 4 ++-- sys/dev/netif/mii_layer/brgphy.c | 4 ++-- sys/dev/netif/mii_layer/e1000phy.c | 4 ++-- sys/dev/netif/mii_layer/ip1000phy.c | 6 +++--- sys/dev/netif/mii_layer/miidevs | 30 +++++++++++++++--------------- sys/dev/netif/msk/if_mskreg.h | 6 +++--- sys/dev/netif/sk/if_sk.c | 4 ++-- 13 files changed, 61 insertions(+), 61 deletions(-) diff --git a/share/man/man4/bge.4 b/share/man/man4/bge.4 index 63ab2020f8..3eb7196cce 100644 --- a/share/man/man4/bge.4 +++ b/share/man/man4/bge.4 @@ -30,7 +30,7 @@ .\" THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $FreeBSD: src/share/man/man4/bge.4,v 1.1.2.4 2003/02/17 21:20:39 trhodes Exp $ -.\" $DragonFly: src/share/man/man4/bge.4,v 1.8 2007/05/13 18:33:56 swildner Exp $ +.\" $DragonFly: src/share/man/man4/bge.4,v 1.9 2008/03/16 15:50:22 hasso Exp $ .\" .Dd March 4, 2007 .Dt BGE 4 @@ -50,13 +50,13 @@ following: .Pp .Bl -bullet -compact .It -3Com 3c996-T (10/100/1000baseTX) +3Com 3c996-T (10/100/1000baseT) .It -Dell PowerEdge 2550 integrated BCM5700 NIC (10/100/1000baseTX) +Dell PowerEdge 2550 integrated BCM5700 NIC (10/100/1000baseT) .It -Netgear GA302T (10/100/1000baseTX) +Netgear GA302T (10/100/1000baseT) .It -SysKonnect SK-9D21 (10/100/1000baseTX) +SysKonnect SK-9D21 (10/100/1000baseT) .It SysKonnect SK-9D41 (1000baseSX) .El @@ -121,8 +121,8 @@ option can also be used to select either or .Cm half-duplex modes. -.It Cm 1000baseTX -Set 1000baseTX operation over twisted pair. +.It Cm 1000baseT +Set 1000baseT operation over twisted pair. .Cm full-duplex and .Cm half-duplex @@ -148,10 +148,10 @@ Force half duplex operation. .Pp The .Nm -driver also supports one special link option for 1000baseTX cards: +driver also supports one special link option for 1000baseT cards: .Bl -tag -width ".Cm link0" .It Cm link0 -With 1000baseTX cards, establishing a link between two ports requires +With 1000baseT cards, establishing a link between two ports requires that one port be configured as a master and the other a slave. With autonegotiation, the master/slave settings will be chosen automatically. diff --git a/share/man/man4/msk.4 b/share/man/man4/msk.4 index 7c52e8b1db..fffba5097e 100644 --- a/share/man/man4/msk.4 +++ b/share/man/man4/msk.4 @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD: src/share/man/man4/msk.4,v 1.6 2007/12/05 09:41:58 remko Exp $ -.\" $DragonFly: src/share/man/man4/msk.4,v 1.2 2007/12/26 16:11:33 swildner Exp $ +.\" $DragonFly: src/share/man/man4/msk.4,v 1.3 2008/03/16 15:50:22 hasso Exp $ .\" .Dd December 26, 2007 .Dt MSK 4 @@ -100,8 +100,8 @@ option can also be used to select either or .Cm half-duplex modes. -.It Cm 1000baseTX -Set 1000baseTX operation over twisted pair. +.It Cm 1000baseT +Set 1000baseT operation over twisted pair. The .Xr ifconfig 8 .Cm mediaopt @@ -131,10 +131,10 @@ Force half duplex operation. .Pp The .Nm -driver also supports one special link option for 1000baseTX cards: +driver also supports one special link option for 1000baseT cards: .Bl -tag -width ".Cm link0" .It Cm link0 -With 1000baseTX cards, establishing a link between two ports requires +With 1000baseT cards, establishing a link between two ports requires that one port is configured as master and the other one as slave. With autonegotiation, the master/slave settings will be chosen automatically. diff --git a/share/man/man4/nge.4 b/share/man/man4/nge.4 index 7e4ab572ae..aa9c67dbab 100644 --- a/share/man/man4/nge.4 +++ b/share/man/man4/nge.4 @@ -30,7 +30,7 @@ .\" THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $FreeBSD: src/share/man/man4/nge.4,v 1.4.2.6 2002/08/15 16:35:37 ambrisko Exp $ -.\" $DragonFly: src/share/man/man4/nge.4,v 1.6 2007/05/13 18:33:56 swildner Exp $ +.\" $DragonFly: src/share/man/man4/nge.4,v 1.7 2008/03/16 15:50:22 hasso Exp $ .\" .Dd May 11, 2001 .Dt NGE 4 @@ -117,8 +117,8 @@ option can also be used to select either or .Cm half-duplex modes. -.It Cm 1000baseTX -Set 1000baseTX operation over twisted pair. +.It Cm 1000baseT +Set 1000baseT operation over twisted pair. .Cm full-duplex and .Cm half-duplex @@ -144,10 +144,10 @@ Force half duplex operation. .Pp The .Nm -driver also supports one special link option for 1000baseTX cards: +driver also supports one special link option for 1000baseT cards: .Bl -tag -width link0 .It Cm link0 -With 1000baseTX cards, establishing a link between two ports requires +With 1000baseT cards, establishing a link between two ports requires that one port be configured as a master and the other a slave. With autonegotiation, the master/slave settings will be chosen automatically. diff --git a/share/man/man4/re.4 b/share/man/man4/re.4 index 6d7e0df513..94dc411e7a 100644 --- a/share/man/man4/re.4 +++ b/share/man/man4/re.4 @@ -29,7 +29,7 @@ .\" THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $FreeBSD$ -.\" $DragonFly: src/share/man/man4/re.4,v 1.5 2007/02/25 12:03:07 swildner Exp $ +.\" $DragonFly: src/share/man/man4/re.4,v 1.6 2008/03/16 15:50:22 hasso Exp $ .\" .Dd November 2, 2006 .Dt RE 4 @@ -109,8 +109,8 @@ option can also be used to select either or .Cm half-duplex modes. -.It Cm 1000baseTX -Set 1000baseTX operation over twisted pair. +.It Cm 1000baseT +Set 1000baseT operation over twisted pair. The RealTek gigE chips support 1000Mbps in .Cm full-duplex mode only. diff --git a/share/man/man4/sk.4 b/share/man/man4/sk.4 index 96f8e41a11..608a089eea 100644 --- a/share/man/man4/sk.4 +++ b/share/man/man4/sk.4 @@ -29,7 +29,7 @@ .\" THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $FreeBSD: src/share/man/man4/sk.4,v 1.8.2.6 2001/08/17 13:08:39 ru Exp $ -.\" $DragonFly: src/share/man/man4/sk.4,v 1.6 2007/05/17 08:19:01 swildner Exp $ +.\" $DragonFly: src/share/man/man4/sk.4,v 1.7 2008/03/16 15:50:22 hasso Exp $ .\" .Dd November 2, 2006 .Dt SK 4 @@ -98,8 +98,8 @@ The user can manually override the autoselected mode by adding media options to the .Pa /etc/rc.conf file. -.It 1000baseTX -Set 1000baseTX operation over twisted pair. +.It 1000baseT +Set 1000baseT operation over twisted pair. This is only available for SK-982x series adapters with 1000baseT ports. Both @@ -129,11 +129,11 @@ Force half duplex operation. .Pp The .Nm -driver also supports one special link option for 1000baseTX cards: +driver also supports one special link option for 1000baseT cards: .Pp .Bl -tag -width xxxxxxxxxxxxxxxxxxxx .It link0 -With 1000baseTX cards, establishing a link between two ports requires +With 1000baseT cards, establishing a link between two ports requires that one port be configured as a master and the other a slave. With autonegotiation, the master/slave settings will be chosen automatically. diff --git a/share/man/man4/vge.4 b/share/man/man4/vge.4 index 8e1e95c48a..1a6f3e9299 100644 --- a/share/man/man4/vge.4 +++ b/share/man/man4/vge.4 @@ -29,7 +29,7 @@ .\" THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $FreeBSD: src/share/man/man4/vge.4,v 1.10 2005/10/07 02:32:15 trhodes Exp $ -.\" $DragonFly: src/share/man/man4/vge.4,v 1.2 2007/02/25 12:03:07 swildner Exp $ +.\" $DragonFly: src/share/man/man4/vge.4,v 1.3 2008/03/16 15:50:22 hasso Exp $ .\" .Dd May 20, 2006 .Dt VGE 4 @@ -115,8 +115,8 @@ option can also be used to select either or .Cm half-duplex modes. -.It Cm 1000baseTX -Set 1000baseTX operation over twisted pair. +.It Cm 1000baseT +Set 1000baseT operation over twisted pair. The .Xr ifconfig 8 .Cm mediaopt @@ -139,10 +139,10 @@ Force half duplex operation. .Pp The .Nm -driver also supports one special link option for 1000baseTX cards: +driver also supports one special link option for 1000baseT cards: .Bl -tag -width ".Cm link0" .It Cm link0 -With 1000baseTX cards, establishing a link between two ports requires +With 1000baseT cards, establishing a link between two ports requires that one port be configured as a master and the other a slave. With autonegotiation, the master/slave settings will be chosen automatically. diff --git a/sys/dev/netif/em/README b/sys/dev/netif/em/README index d719bab6f2..615d078d21 100644 --- a/sys/dev/netif/em/README +++ b/sys/dev/netif/em/README @@ -1,4 +1,4 @@ -$DragonFly: src/sys/dev/netif/em/README,v 1.7 2006/12/23 10:39:16 sephe Exp $ +$DragonFly: src/sys/dev/netif/em/README,v 1.8 2008/03/16 15:50:22 hasso Exp $ FreeBSD* Driver for the Intel(R) PRO/1000 Family of Adapters ============================================================ @@ -162,7 +162,7 @@ This driver supports the following media type options: 100baseTX - Sets speed to 100 Mbps. Use the ifconfig mediaopt option to select full-duplex mode. - 1000baseTX - Sets speed to 1000 Mbps. In this case, the driver + 1000baseT - Sets speed to 1000 Mbps. In this case, the driver supports only full-duplex mode. 1000baseSX - Sets speed to 1000 Mbps. In this case, the driver diff --git a/sys/dev/netif/mii_layer/brgphy.c b/sys/dev/netif/mii_layer/brgphy.c index 2d35542eb1..f23de00e46 100644 --- a/sys/dev/netif/mii_layer/brgphy.c +++ b/sys/dev/netif/mii_layer/brgphy.c @@ -32,11 +32,11 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mii/brgphy.c,v 1.1.2.7 2003/05/11 18:00:55 ps Exp $ - * $DragonFly: src/sys/dev/netif/mii_layer/brgphy.c,v 1.19 2007/06/19 14:59:40 sephe Exp $ + * $DragonFly: src/sys/dev/netif/mii_layer/brgphy.c,v 1.20 2008/03/16 15:50:22 hasso Exp $ */ /* - * Driver for the Broadcom BCR5400 1000baseTX PHY. Speed is always + * Driver for the Broadcom BCR5400 1000baseT PHY. Speed is always * 1000mbps; all we need to negotiate here is full or half duplex. */ diff --git a/sys/dev/netif/mii_layer/e1000phy.c b/sys/dev/netif/mii_layer/e1000phy.c index f56e122b85..142de2b526 100644 --- a/sys/dev/netif/mii_layer/e1000phy.c +++ b/sys/dev/netif/mii_layer/e1000phy.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/mii/e1000phy.c,v 1.18 2006/12/11 11:09:48 yongari Exp $ */ -/* $DragonFly: src/sys/dev/netif/mii_layer/e1000phy.c,v 1.10 2007/08/07 11:44:41 sephe Exp $ */ +/* $DragonFly: src/sys/dev/netif/mii_layer/e1000phy.c,v 1.11 2008/03/16 15:50:22 hasso Exp $ */ /* $OpenBSD: eephy.c,v 1.26 2006/06/08 00:27:12 brad Exp $ */ /* * Principal Author: Parag Patel @@ -37,7 +37,7 @@ */ /* - * Support added for the Marvell 88E1011 (Alaska) 1000/100/10baseTX and + * Support added for the Marvell 88E1011 (Alaska) 1000/100/10baseT and * 1000baseSX PHY. * Nathan Binkert * Jung-uk Kim diff --git a/sys/dev/netif/mii_layer/ip1000phy.c b/sys/dev/netif/mii_layer/ip1000phy.c index b9080e0e23..fb6b295d58 100644 --- a/sys/dev/netif/mii_layer/ip1000phy.c +++ b/sys/dev/netif/mii_layer/ip1000phy.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mii/ip1000phy.c,v 1.1 2006/07/25 00:16:09 yongari Exp $ - * $DragonFly: src/sys/dev/netif/mii_layer/ip1000phy.c,v 1.2 2006/12/22 23:26:20 swildner Exp $ + * $DragonFly: src/sys/dev/netif/mii_layer/ip1000phy.c,v 1.3 2008/03/16 15:50:22 hasso Exp $ */ /* @@ -145,10 +145,10 @@ ip1000phy_attach(device_t dev) /* 1000baseT half-duplex, really supported? */ ADD(IFM_MAKEWORD(IFM_ETHER, IFM_1000_T, 0, sc->mii_inst), IP1000PHY_BMCR_1000); - kprintf("1000baseTX, "); + kprintf("1000baseT, "); ADD(IFM_MAKEWORD(IFM_ETHER, IFM_1000_T, IFM_FDX, sc->mii_inst), IP1000PHY_BMCR_1000 | IP1000PHY_BMCR_FDX); - kprintf("1000baseTX-FDX, "); + kprintf("1000baseT-FDX, "); ADD(IFM_MAKEWORD(IFM_ETHER, IFM_AUTO, 0, sc->mii_inst), 0); kprintf("auto\n"); #undef ADD diff --git a/sys/dev/netif/mii_layer/miidevs b/sys/dev/netif/mii_layer/miidevs index 8856357fe8..86128e8bde 100644 --- a/sys/dev/netif/mii_layer/miidevs +++ b/sys/dev/netif/mii_layer/miidevs @@ -1,4 +1,4 @@ -$DragonFly: src/sys/dev/netif/mii_layer/miidevs,v 1.14 2007/12/26 13:02:03 sephe Exp $ +$DragonFly: src/sys/dev/netif/mii_layer/miidevs,v 1.15 2008/03/16 15:50:22 hasso Exp $ /* $FreeBSD: src/sys/dev/mii/miidevs,v 1.4.2.13 2003/07/22 02:12:55 ps Exp $ */ /*$NetBSD: miidevs,v 1.6 1999/05/14 11:37:30 drochner Exp $*/ @@ -125,7 +125,7 @@ model AMD 79c973phy 0x0036 Am79c973 internal PHY model AMD 79c978 0x0039 Am79c978 HomePNA PHY /* Broadcom Corp. PHYs. */ -model BROADCOM BCM5400 0x0004 BCM5400 1000baseT PHY +model BROADCOM BCM5400 0x0004 BCM5400 100/1000baseT PHY model BROADCOM BCM5401 0x0005 BCM5401 1000baseT PHY model BROADCOM BCM5411 0x0007 BCM5411 1000baseT PHY model BROADCOM 3C905B 0x0012 Broadcom 3C905B internal PHY @@ -136,17 +136,17 @@ model BROADCOM BCM5214 0x0028 BCM5214 Quad 10/100 PHY model BROADCOM BCM5222 0x0032 BCM5222 Dual 10/100 PHY model BROADCOM BCM5220 0x0033 BCM5220 10/100 PHY model BROADCOM BCM4401 0x0036 BCM4401 10/100baseTX PHY -model xxBROADCOM BCM5400 0x0004 Broadcom 1000baseTX PHY -model xxBROADCOM BCM5401 0x0005 BCM5401 10/100/1000baseTX PHY -model xxBROADCOM BCM5411 0x0007 BCM5411 10/100/1000baseTX PHY +model xxBROADCOM BCM5400 0x0004 Broadcom 100/1000baseT PHY +model xxBROADCOM BCM5401 0x0005 BCM5401 10/100/1000baseT PHY +model xxBROADCOM BCM5411 0x0007 BCM5411 10/100/1000baseT PHY model xxBROADCOM BCM5462 0x000d BCM5462 10/100/1000baseT PHY model xxBROADCOM BCM5421 0x000e BCM5421 10/100/1000baseT PHY model xxBROADCOM BCM5752 0x0010 BCM5752 10/100/1000baseT PHY -model xxBROADCOM BCM5701 0x0011 BCM5701 10/100/1000baseTX PHY +model xxBROADCOM BCM5701 0x0011 BCM5701 10/100/1000baseT PHY model xxBROADCOM BCM5706C 0x0015 BCM5706C 10/100/1000baseT PHY -model xxBROADCOM BCM5703 0x0016 BCM5703 10/100/1000baseTX PHY -model xxBROADCOM BCM5704 0x0019 BCM5704 10/100/1000baseTX PHY -model xxBROADCOM BCM5705 0x001a BCM5705 10/100/1000baseTX PHY +model xxBROADCOM BCM5703 0x0016 BCM5703 10/100/1000baseT PHY +model xxBROADCOM BCM5704 0x0019 BCM5704 10/100/1000baseT PHY +model xxBROADCOM BCM5705 0x001a BCM5705 10/100/1000baseT PHY model xxBROADCOM BCM5750 0x0018 BCM5750 10/100/1000baseT PHY model xxBROADCOM BCM54K2 0x002e BCM54K2 10/100/1000baseT PHY model xxBROADCOM BCM5714 0x0034 BCM5714 10/100/1000baseT PHY @@ -157,12 +157,12 @@ model xxBROADCOM2 BCM5787 0x000e BCM5787 10/100/1000baseT PHY model BROADCOM2 BCM5906 0x0004 BCM5906 10/100baseTX PHY /* Cicada Semiconductor PHYs (now owned by Vitesse?) */ -model CICADA CS8201 0x0001 Cicada CS8201 10/100/1000TX PHY -model CICADA CS8201A 0x0020 Cicada CS8201 10/100/1000TX PHY -model CICADA CS8201B 0x0021 Cicada CS8201 10/100/1000TX PHY -model xxCICADA CS8201 0x0001 Cicada CS8201 10/100/1000TX PHY -model xxCICADA CS8201A 0x0020 Cicada CS8201 10/100/1000TX PHY -model xxCICADA CS8201B 0x0021 Cicada CS8201 10/100/1000TX PHY +model CICADA CS8201 0x0001 Cicada CS8201 10/100/1000T PHY +model CICADA CS8201A 0x0020 Cicada CS8201 10/100/1000T PHY +model CICADA CS8201B 0x0021 Cicada CS8201 10/100/1000T PHY +model xxCICADA CS8201 0x0001 Cicada CS8201 10/100/1000T PHY +model xxCICADA CS8201A 0x0020 Cicada CS8201 10/100/1000T PHY +model xxCICADA CS8201B 0x0021 Cicada CS8201 10/100/1000T PHY /* Davicom Semiconductor PHYs */ model xxDAVICOM DM9101 0x0000 DM9101 10/100 media interface diff --git a/sys/dev/netif/msk/if_mskreg.h b/sys/dev/netif/msk/if_mskreg.h index 75a035fe3a..10f35a7330 100644 --- a/sys/dev/netif/msk/if_mskreg.h +++ b/sys/dev/netif/msk/if_mskreg.h @@ -94,7 +94,7 @@ */ /* $FreeBSD: src/sys/dev/msk/if_mskreg.h,v 1.11 2007/12/05 09:41:58 remko Exp $ */ -/* $DragonFly: src/sys/dev/netif/msk/if_mskreg.h,v 1.1 2007/12/26 14:02:36 sephe Exp $ */ +/* $DragonFly: src/sys/dev/netif/msk/if_mskreg.h,v 1.2 2008/03/16 15:50:22 hasso Exp $ */ /* * SysKonnect PCI vendor ID @@ -1247,8 +1247,8 @@ #define PHY_M_AN_100_T4 BIT_9 /* Not cap. 100Base-T4 (always 0) */ #define PHY_M_AN_100_FD BIT_8 /* Advertise 100Base-TX Full Duplex */ #define PHY_M_AN_100_HD BIT_7 /* Advertise 100Base-TX Half Duplex */ -#define PHY_M_AN_10_FD BIT_6 /* Advertise 10Base-TX Full Duplex */ -#define PHY_M_AN_10_HD BIT_5 /* Advertise 10Base-TX Half Duplex */ +#define PHY_M_AN_10_FD BIT_6 /* Advertise 10Base-T Full Duplex */ +#define PHY_M_AN_10_HD BIT_5 /* Advertise 10Base-T Half Duplex */ #define PHY_M_AN_SEL_MSK (0x1f<<4) /* Bit 4.. 0: Selector Field Mask */ /* special defines for FIBER (88E1011S only) */ diff --git a/sys/dev/netif/sk/if_sk.c b/sys/dev/netif/sk/if_sk.c index 8c0b79d897..45d5254e29 100644 --- a/sys/dev/netif/sk/if_sk.c +++ b/sys/dev/netif/sk/if_sk.c @@ -31,7 +31,7 @@ * * $OpenBSD: if_sk.c,v 1.129 2006/10/16 12:30:08 tom Exp $ * $FreeBSD: /c/ncvs/src/sys/pci/if_sk.c,v 1.20 2000/04/22 02:16:37 wpaul Exp $ - * $DragonFly: src/sys/dev/netif/sk/if_sk.c,v 1.54 2007/12/14 11:37:10 sephe Exp $ + * $DragonFly: src/sys/dev/netif/sk/if_sk.c,v 1.55 2008/03/16 15:50:22 hasso Exp $ */ /* @@ -2326,7 +2326,7 @@ sk_init_xmac(struct sk_if_softc *sc_if) /* * Perform additional initialization for external PHYs, - * namely for the 1000baseTX cards that use the XMAC's + * namely for the 1000baseT cards that use the XMAC's * GMII mode. */ if (sc_if->sk_phytype == SK_PHYTYPE_BCOM) { -- 2.11.4.GIT