svn commit: r224315 - stable/7/sys/dev/mii

Marius Strobl marius at FreeBSD.org
Mon Jul 25 14:44:01 UTC 2011 

Author: marius
Date: Mon Jul 25 14:44:00 2011
New Revision: 224315
URL: http://svn.freebsd.org/changeset/base/224315

Log:
  MFC: r220938
  
  Correct spelling in comments.
  
  Submitted by:	brucec

Modified:
  stable/7/sys/dev/mii/brgphyreg.h
  stable/7/sys/dev/mii/ciphyreg.h
  stable/7/sys/dev/mii/e1000phy.c
  stable/7/sys/dev/mii/e1000phyreg.h
  stable/7/sys/dev/mii/mii_physubr.c
  stable/7/sys/dev/mii/miivar.h
  stable/7/sys/dev/mii/rgephyreg.h
  stable/7/sys/dev/mii/xmphyreg.h
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/mii/brgphyreg.h
==============================================================================
--- stable/7/sys/dev/mii/brgphyreg.h	Mon Jul 25 14:43:51 2011	(r224314)
+++ stable/7/sys/dev/mii/brgphyreg.h	Mon Jul 25 14:44:00 2011	(r224315)
@@ -59,7 +59,7 @@
 #define	BRGPHY_BMSR_EXTSTS	0x0100	/* Extended status present */
 #define	BRGPHY_BMSR_PRESUB	0x0040	/* Preamble surpression */
 #define	BRGPHY_BMSR_ACOMP	0x0020	/* Autoneg complete */
-#define	BRGPHY_BMSR_RFAULT	0x0010	/* Remote fault condition occured */
+#define	BRGPHY_BMSR_RFAULT	0x0010	/* Remote fault condition occurred */
 #define	BRGPHY_BMSR_ANEG	0x0008	/* Autoneg capable */
 #define	BRGPHY_BMSR_LINK	0x0004	/* Link status */
 #define	BRGPHY_BMSR_JABBER	0x0002	/* Jabber detected */

Modified: stable/7/sys/dev/mii/ciphyreg.h
==============================================================================
--- stable/7/sys/dev/mii/ciphyreg.h	Mon Jul 25 14:43:51 2011	(r224314)
+++ stable/7/sys/dev/mii/ciphyreg.h	Mon Jul 25 14:44:00 2011	(r224315)
@@ -68,7 +68,7 @@
 #define CIPHY_BMSR_EXTSTS	0x0100	/* Extended status present */
 #define CIPHY_BMSR_PRESUB	0x0040	/* Preamble surpression */
 #define CIPHY_BMSR_ACOMP	0x0020	/* Autoneg complete */
-#define CIPHY_BMSR_RFAULT	0x0010	/* Remote fault condition occured */
+#define CIPHY_BMSR_RFAULT	0x0010	/* Remote fault condition occurred */
 #define CIPHY_BMSR_ANEG		0x0008	/* Autoneg capable */
 #define CIPHY_BMSR_LINK		0x0004	/* Link status */
 #define CIPHY_BMSR_JABBER	0x0002	/* Jabber detected */
@@ -170,7 +170,7 @@
 
 /* Vendor-specific PHY registers */
 
-/* 100baseTX status extention register */
+/* 100baseTX status extension register */
 #define CIPHY_MII_100STS	0x10
 #define CIPHY_100STS_DESLCK	0x8000	/* descrambler locked */
 #define CIPHY_100STS_LKCERR	0x4000	/* lock error detected/lock lost */
@@ -181,7 +181,7 @@
 #define CIPHY_100STS_SSDERR	0x0200	/* false carrier error detected */
 #define CIPHY_100STS_ESDERR	0x0100	/* premature end of stream error */
 
-/* 1000BT status extention register #2 */
+/* 1000BT status extension register #2 */
 #define CIPHY_MII_1000STS2	0x11
 #define CIPHY_1000STS2_DESLCK	0x8000	/* descrambler locked */
 #define CIPHY_1000STS2_LKCERR	0x4000	/* lock error detected/lock lost */
@@ -191,7 +191,7 @@
 #define CIPHY_1000STS2_TXERR	0x0400	/* transmit error detected */
 #define CIPHY_1000STS2_SSDERR	0x0200	/* false carrier error detected */
 #define CIPHY_1000STS2_ESDERR	0x0100	/* premature end of stream error */
-#define CIPHY_1000STS2_CARREXT	0x0080	/* carrier extention err detected */
+#define CIPHY_1000STS2_CARREXT	0x0080	/* carrier extension err detected */
 #define CIPHY_1000STS2_BCM5400	0x0040	/* non-complient BCM5400 detected */
 
 /* Bypass control register */
@@ -332,7 +332,7 @@
 #define CIPHY_LED_LINKACTBLINK	0x0004	/* enable link/activity LED blink */
 #define CIPHY_LED_BLINKRATE	0x0002	/* blink rate 0=10hz, 1=5hz */
 
-/* Auxilliary control and status register */
+/* Auxiliary control and status register */
 #define CIPHY_MII_AUXCSR	0x1C
 #define CIPHY_AUXCSR_ANEGDONE	0x8000	/* Autoneg complete */
 #define CIPHY_AUXCSR_ANEGOFF	0x4000	/* Autoneg disabled */

Modified: stable/7/sys/dev/mii/e1000phy.c
==============================================================================
--- stable/7/sys/dev/mii/e1000phy.c	Mon Jul 25 14:43:51 2011	(r224314)
+++ stable/7/sys/dev/mii/e1000phy.c	Mon Jul 25 14:44:00 2011	(r224315)
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * Additonal Copyright (c) 2001 by Traakan Software under same licence.
+ * Additional Copyright (c) 2001 by Traakan Software under same licence.
  * Secondary Author: Matthew Jacob
  */
 

Modified: stable/7/sys/dev/mii/e1000phyreg.h
==============================================================================
--- stable/7/sys/dev/mii/e1000phyreg.h	Mon Jul 25 14:43:51 2011	(r224314)
+++ stable/7/sys/dev/mii/e1000phyreg.h	Mon Jul 25 14:44:00 2011	(r224315)
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * Additonal Copyright (c) 2001 by Traakan Software under same licence.
+ * Additional Copyright (c) 2001 by Traakan Software under same licence.
  * Secondary Author: Matthew Jacob
  */
 

Modified: stable/7/sys/dev/mii/mii_physubr.c
==============================================================================
--- stable/7/sys/dev/mii/mii_physubr.c	Mon Jul 25 14:43:51 2011	(r224314)
+++ stable/7/sys/dev/mii/mii_physubr.c	Mon Jul 25 14:44:00 2011	(r224315)
@@ -109,7 +109,7 @@ mii_phy_setmedia(struct mii_softc *sc)
 		/*
 		 * Force renegotiation if MIIF_DOPAUSE or MIIF_FORCEANEG.
 		 * The former is necessary as we might switch from flow-
-		 * control advertisment being off to on or vice versa.
+		 * control advertisement being off to on or vice versa.
 		 */
 		if ((PHY_READ(sc, MII_BMCR) & BMCR_AUTOEN) == 0 ||
 		    (sc->mii_flags & (MIIF_DOPAUSE | MIIF_FORCEANEG)) != 0)

Modified: stable/7/sys/dev/mii/miivar.h
==============================================================================
--- stable/7/sys/dev/mii/miivar.h	Mon Jul 25 14:43:51 2011	(r224314)
+++ stable/7/sys/dev/mii/miivar.h	Mon Jul 25 14:44:00 2011	(r224315)
@@ -134,7 +134,7 @@ typedef struct mii_softc mii_softc_t;
 #define	MIIF_IS_HPNA	0x00000200	/* is a HomePNA device */
 #define	MIIF_FORCEANEG	0x00000400	/* force auto-negotiation */
 #define	MIIF_NOMANPAUSE	0x00100000	/* no manual PAUSE selection */
-#define	MIIF_FORCEPAUSE	0x00200000	/* force PAUSE advertisment */
+#define	MIIF_FORCEPAUSE	0x00200000	/* force PAUSE advertisement */
 #define	MIIF_MACPRIV0	0x01000000	/* private to the MAC driver */
 #define	MIIF_MACPRIV1	0x02000000	/* private to the MAC driver */
 #define	MIIF_MACPRIV2	0x04000000	/* private to the MAC driver */

Modified: stable/7/sys/dev/mii/rgephyreg.h
==============================================================================
--- stable/7/sys/dev/mii/rgephyreg.h	Mon Jul 25 14:43:51 2011	(r224314)
+++ stable/7/sys/dev/mii/rgephyreg.h	Mon Jul 25 14:44:00 2011	(r224315)
@@ -66,7 +66,7 @@
 #define RGEPHY_BMSR_EXTSTS	0x0100	/* Extended status present */
 #define RGEPHY_BMSR_PRESUB	0x0040	/* Preamble surpression */
 #define RGEPHY_BMSR_ACOMP	0x0020	/* Autoneg complete */
-#define RGEPHY_BMSR_RFAULT	0x0010	/* Remote fault condition occured */
+#define RGEPHY_BMSR_RFAULT	0x0010	/* Remote fault condition occurred */
 #define RGEPHY_BMSR_ANEG	0x0008	/* Autoneg capable */
 #define RGEPHY_BMSR_LINK	0x0004	/* Link status */
 #define RGEPHY_BMSR_JABBER	0x0002	/* Jabber detected */

Modified: stable/7/sys/dev/mii/xmphyreg.h
==============================================================================
--- stable/7/sys/dev/mii/xmphyreg.h	Mon Jul 25 14:43:51 2011	(r224314)
+++ stable/7/sys/dev/mii/xmphyreg.h	Mon Jul 25 14:44:00 2011	(r224315)
@@ -51,7 +51,7 @@
 #define XMPHY_MII_BMSR		0x01
 #define XMPHY_BMSR_EXTSTS	0x0100	/* Extended status present */
 #define XMPHY_BMSR_ACOMP	0x0020	/* Autoneg complete */
-#define XMPHY_BMSR_RFAULT	0x0010	/* Remote fault condition occured */
+#define XMPHY_BMSR_RFAULT	0x0010	/* Remote fault condition occurred */
 #define XMPHY_BMSR_ANEG		0x0008	/* Autoneg capable */
 #define XMPHY_BMSR_LINK		0x0004	/* Link status */
 #define XMPHY_BMSR_EXT		0x0001	/* Extended capability */

More information about the svn-src-stable-7 mailing list