From 0be714dc9911293e98ffee8ea0ff60847c0c7f2a Mon Sep 17 00:00:00 2001 From: msaitoh Date: Mon, 16 Jun 2014 14:43:22 +0000 Subject: [PATCH] No functional change: - Fix typo. - Remove trailing white spaces. - Capitalize comments. - Tabify. - KNF. --- sys/dev/mii/bmtphy.c | 13 ++++++------- sys/dev/mii/brgphyreg.h | 36 ++++++++++++++++++------------------ sys/dev/mii/ciphyreg.h | 10 +++++----- sys/dev/mii/gentbi.c | 8 ++++---- sys/dev/mii/mii.h | 6 +++--- sys/dev/mii/nsphy.c | 6 +++--- sys/dev/mii/rlphy.c | 6 +++--- sys/dev/mii/ukphy_subr.c | 6 +++--- 8 files changed, 45 insertions(+), 46 deletions(-) diff --git a/sys/dev/mii/bmtphy.c b/sys/dev/mii/bmtphy.c index 107712bf7cd6..8afae2ae9b81 100644 --- a/sys/dev/mii/bmtphy.c +++ b/sys/dev/mii/bmtphy.c @@ -1,4 +1,4 @@ -/* $NetBSD: bmtphy.c,v 1.30 2009/10/19 18:41:13 bouyer Exp $ */ +/* $NetBSD: bmtphy.c,v 1.31 2014/06/16 14:43:22 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -61,7 +61,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: bmtphy.c,v 1.30 2009/10/19 18:41:13 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bmtphy.c,v 1.31 2014/06/16 14:43:22 msaitoh Exp $"); #include #include @@ -247,7 +247,7 @@ bmtphy_status(struct mii_softc *sc) if (bmcr & BMCR_AUTOEN) { /* - * The media status bits are only valid of autonegotiation + * The media status bits are only valid if autonegotiation * has completed (or it's disabled). */ if ((bmsr & BMSR_ACOMP) == 0) { @@ -272,7 +272,7 @@ bmtphy_status(struct mii_softc *sc) mii->mii_media_active = ife->ifm_media; } -static void +static void bmtphy_reset(struct mii_softc *sc) { u_int16_t data; @@ -288,8 +288,7 @@ bmtphy_reset(struct mii_softc *sc) data = PHY_READ(sc, MII_BMTPHY_AUX2); PHY_WRITE(sc, MII_BMTPHY_AUX2, data | 0x0020); - /* Enable clocks across APD for - * Auto-MDIX functionality */ + /* Enable clocks across APD for Auto-MDIX functionality */ data = PHY_READ(sc, MII_BMTPHY_INTR); PHY_WRITE(sc, MII_BMTPHY_INTR, data | 0x0004); @@ -297,4 +296,4 @@ bmtphy_reset(struct mii_softc *sc) data = PHY_READ(sc, 0x1f); PHY_WRITE(sc, 0x1f, data & ~0x0080); } -} +} diff --git a/sys/dev/mii/brgphyreg.h b/sys/dev/mii/brgphyreg.h index 0f0b7611127c..d6152b1a5c12 100644 --- a/sys/dev/mii/brgphyreg.h +++ b/sys/dev/mii/brgphyreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: brgphyreg.h,v 1.7 2014/06/12 12:09:47 msaitoh Exp $ */ +/* $NetBSD: brgphyreg.h,v 1.8 2014/06/16 14:43:22 msaitoh Exp $ */ /* * Copyright (c) 2000 @@ -52,7 +52,7 @@ #define BRGPHY_MII_PHY_EXTCTL 0x10 /* PHY extended control */ #define BRGPHY_PHY_EXTCTL_MAC_PHY 0x8000 /* 10BIT/GMI-interface */ #define BRGPHY_PHY_EXTCTL_DIS_CROSS 0x4000 /* Disable MDI crossover */ -#define BRGPHY_PHY_EXTCTL_TX_DIS 0x2000 /* Tx output disable d*/ +#define BRGPHY_PHY_EXTCTL_TX_DIS 0x2000 /* Tx output disabled */ #define BRGPHY_PHY_EXTCTL_INT_DIS 0x1000 /* Interrupts disabled */ #define BRGPHY_PHY_EXTCTL_F_INT 0x0800 /* Force interrupt */ #define BRGPHY_PHY_EXTCTL_BY_45 0x0400 /* Bypass 4B5B-Decoder */ @@ -85,7 +85,7 @@ #define BRGPHY_MII_RXERRCNT 0x12 /* RX error counter */ -#define BRGPHY_MII_FCERRCNT 0x13 /* false carrier sense counter */ +#define BRGPHY_MII_FCERRCNT 0x13 /* False carrier sense counter */ #define BGRPHY_FCERRCNT 0x00FF /* False carrier counter */ #define BRGPHY_MII_RXNOCNT 0x14 /* RX not OK counter */ @@ -140,14 +140,14 @@ #define BRGPHY_AUXCTL_DIAG_MODE 0x0004 /* Diagnostic mode */ #define BRGPHY_MII_AUXSTS 0x19 /* AUX status */ -#define BRGPHY_AUXSTS_ACOMP 0x8000 /* autoneg complete */ -#define BRGPHY_AUXSTS_AN_ACK 0x4000 /* autoneg complete ack */ -#define BRGPHY_AUXSTS_AN_ACK_D 0x2000 /* autoneg complete ack detect */ -#define BRGPHY_AUXSTS_AN_NPW 0x1000 /* autoneg next page wait */ -#define BRGPHY_AUXSTS_AN_RES 0x0700 /* AN HDC */ +#define BRGPHY_AUXSTS_ACOMP 0x8000 /* Autoneg complete */ +#define BRGPHY_AUXSTS_AN_ACK 0x4000 /* Autoneg complete ack */ +#define BRGPHY_AUXSTS_AN_ACK_D 0x2000 /* Autoneg complete ack detect */ +#define BRGPHY_AUXSTS_AN_NPW 0x1000 /* Autoneg next page wait */ +#define BRGPHY_AUXSTS_AN_RES 0x0700 /* Autoneg HCD */ #define BRGPHY_AUXSTS_PDF 0x0080 /* Parallel detect. fault */ -#define BRGPHY_AUXSTS_RF 0x0040 /* remote fault */ -#define BRGPHY_AUXSTS_ANP_R 0x0020 /* AN page received */ +#define BRGPHY_AUXSTS_RF 0x0040 /* Remote fault */ +#define BRGPHY_AUXSTS_ANP_R 0x0020 /* Autoneg page received */ #define BRGPHY_AUXSTS_LP_ANAB 0x0010 /* LP AN ability */ #define BRGPHY_AUXSTS_LP_NPAB 0x0008 /* LP Next page ability */ #define BRGPHY_AUXSTS_LINK 0x0004 /* Link status */ @@ -162,11 +162,11 @@ #define BRGPHY_RES_10FD 0x0200 /* 10baseT full duplex */ #define BRGPHY_RES_10HD 0x0100 /* 10baseT half duplex */ -#define BRGPHY_MII_ISR 0x1A /* interrupt status */ +#define BRGPHY_MII_ISR 0x1A /* Interrupt status */ #define BRGPHY_ISR_PSERR 0x4000 /* Pair swap error */ #define BRGPHY_ISR_MDXI_SC 0x2000 /* MDIX Status Change */ -#define BRGPHY_ISR_HCT 0x1000 /* counter above 32K */ -#define BRGPHY_ISR_LCT 0x0800 /* all counter below 128 */ +#define BRGPHY_ISR_HCT 0x1000 /* Counter above 32K */ +#define BRGPHY_ISR_LCT 0x0800 /* All counter below 128 */ #define BRGPHY_ISR_AN_PR 0x0400 /* Autoneg page received */ #define BRGPHY_ISR_NO_HDCL 0x0200 /* No HCD Link */ #define BRGPHY_ISR_NO_HDC 0x0100 /* No HCD */ @@ -177,13 +177,13 @@ #define BRGPHY_ISR_DUP_CHG 0x0008 /* Duplex mode change */ #define BRGPHY_ISR_LSP_CHG 0x0004 /* Link speed changed */ #define BRGPHY_ISR_LNK_CHG 0x0002 /* Link status change */ -#define BRGPHY_ISR_CRCERR 0x0001 /* CEC error */ +#define BRGPHY_ISR_CRCERR 0x0001 /* CRC error */ -#define BRGPHY_MII_IMR 0x1B /* interrupt mask */ +#define BRGPHY_MII_IMR 0x1B /* Interrupt mask */ #define BRGPHY_IMR_PSERR 0x4000 /* Pair swap error */ #define BRGPHY_IMR_MDXI_SC 0x2000 /* MDIX Status Change */ -#define BRGPHY_IMR_HCT 0x1000 /* counter above 32K */ -#define BRGPHY_IMR_LCT 0x0800 /* all counter below 128 */ +#define BRGPHY_IMR_HCT 0x1000 /* Counter above 32K */ +#define BRGPHY_IMR_LCT 0x0800 /* All counter below 128 */ #define BRGPHY_IMR_AN_PR 0x0400 /* Autoneg page received */ #define BRGPHY_IMR_NO_HDCL 0x0200 /* No HCD Link */ #define BRGPHY_IMR_NO_HDC 0x0100 /* No HCD */ @@ -194,7 +194,7 @@ #define BRGPHY_IMR_DUP_CHG 0x0008 /* Duplex mode change */ #define BRGPHY_IMR_LSP_CHG 0x0004 /* Link speed changed */ #define BRGPHY_IMR_LNK_CHG 0x0002 /* Link status change */ -#define BRGPHY_IMR_CRCERR 0x0001 /* CEC error */ +#define BRGPHY_IMR_CRCERR 0x0001 /* CRC error */ /*******************************************************/ /* Begin: PHY register values for the 5706 PHY */ diff --git a/sys/dev/mii/ciphyreg.h b/sys/dev/mii/ciphyreg.h index 095624a0df34..3c58d135a080 100644 --- a/sys/dev/mii/ciphyreg.h +++ b/sys/dev/mii/ciphyreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: ciphyreg.h,v 1.4 2006/03/12 22:41:41 chs Exp $ */ +/* $NetBSD: ciphyreg.h,v 1.5 2014/06/16 14:43:22 msaitoh Exp $ */ /*- * Copyright (c) 2004 @@ -172,7 +172,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 */ @@ -183,7 +183,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 */ @@ -193,7 +193,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 */ @@ -334,7 +334,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 */ diff --git a/sys/dev/mii/gentbi.c b/sys/dev/mii/gentbi.c index df960fb3305e..59828dd6ab74 100644 --- a/sys/dev/mii/gentbi.c +++ b/sys/dev/mii/gentbi.c @@ -1,4 +1,4 @@ -/* $NetBSD: gentbi.c,v 1.25 2014/06/11 22:34:26 msaitoh Exp $ */ +/* $NetBSD: gentbi.c,v 1.26 2014/06/16 14:43:22 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -55,14 +55,14 @@ */ /* - * Driver for generic ten-bit (1000BASE-SX) interfaces, built in to + * Driver for generic ten-bit (1000BASE-SX) interfaces, built into * many Gigabit Ethernet chips. * * All we have to do here is correctly report speed and duplex. */ #include -__KERNEL_RCSID(0, "$NetBSD: gentbi.c,v 1.25 2014/06/11 22:34:26 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gentbi.c,v 1.26 2014/06/16 14:43:22 msaitoh Exp $"); #include #include @@ -261,7 +261,7 @@ gentbi_status(struct mii_softc *sc) if (bmcr & BMCR_AUTOEN) { /* - * The media status bits are only valid of autonegotiation + * The media status bits are only valid if autonegotiation * has completed (or it's disabled). */ if ((bmsr & BMSR_ACOMP) == 0) { diff --git a/sys/dev/mii/mii.h b/sys/dev/mii/mii.h index 16e58996f8ea..30bfb036f145 100644 --- a/sys/dev/mii/mii.h +++ b/sys/dev/mii/mii.h @@ -1,4 +1,4 @@ -/* $NetBSD: mii.h,v 1.17 2013/06/16 06:29:08 msaitoh Exp $ */ +/* $NetBSD: mii.h,v 1.18 2014/06/16 14:43:22 msaitoh Exp $ */ /* * Copyright (c) 1997 Manuel Bouyer. All rights reserved. @@ -45,7 +45,7 @@ #define MII_COMMAND_WRITE 0x01 #define MII_COMMAND_ACK 0x02 -#define MII_BMCR 0x00 /* Basic mode control register (rw) */ +#define MII_BMCR 0x00 /* Basic mode control register (rw) */ #define BMCR_RESET 0x8000 /* reset */ #define BMCR_LOOP 0x4000 /* loopback */ #define BMCR_SPEED0 0x2000 /* speed selection (LSB) */ @@ -83,7 +83,7 @@ /* * Note that the EXTSTAT bit indicates that there is extended status * info available in register 15, but 802.3 section 22.2.4.3 also - * states that that all 1000 Mb/s capable PHYs will set this bit to 1. + * states that all 1000 Mb/s capable PHYs will set this bit to 1. */ #define BMSR_MEDIAMASK (BMSR_100T4|BMSR_100TXFDX|BMSR_100TXHDX| \ diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c index f12d3d3397a4..e8fbdb132d8e 100644 --- a/sys/dev/mii/nsphy.c +++ b/sys/dev/mii/nsphy.c @@ -1,4 +1,4 @@ -/* $NetBSD: nsphy.c,v 1.57 2009/10/19 18:41:14 bouyer Exp $ */ +/* $NetBSD: nsphy.c,v 1.58 2014/06/16 14:43:22 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -60,7 +60,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: nsphy.c,v 1.57 2009/10/19 18:41:14 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nsphy.c,v 1.58 2014/06/16 14:43:22 msaitoh Exp $"); #include #include @@ -264,7 +264,7 @@ nsphy_status(struct mii_softc *sc) if (bmcr & BMCR_AUTOEN) { /* - * The PAR status bits are only valid of autonegotiation + * The PAR status bits are only valid if autonegotiation * has completed (or it's disabled). */ if ((bmsr & BMSR_ACOMP) == 0) { diff --git a/sys/dev/mii/rlphy.c b/sys/dev/mii/rlphy.c index 2064192f4fab..3c20faa31d2f 100644 --- a/sys/dev/mii/rlphy.c +++ b/sys/dev/mii/rlphy.c @@ -1,4 +1,4 @@ -/* $NetBSD: rlphy.c,v 1.27 2011/01/20 14:26:11 pooka Exp $ */ +/* $NetBSD: rlphy.c,v 1.28 2014/06/16 14:43:22 msaitoh Exp $ */ /* $OpenBSD: rlphy.c,v 1.20 2005/07/31 05:27:30 pvalchev Exp $ */ /* @@ -38,7 +38,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: rlphy.c,v 1.27 2011/01/20 14:26:11 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rlphy.c,v 1.28 2014/06/16 14:43:22 msaitoh Exp $"); #include #include @@ -261,7 +261,7 @@ rlphy_status(struct mii_softc *sc) /* * If the other side doesn't support NWAY, then the * best we can do is determine if we have a 10Mbps or - * 100Mbps link. There's no way to know if the link + * 100Mbps link. There's no way to know if the link * is full or half duplex, so we default to half duplex * and hope that the user is clever enough to manually * change the media settings if we're wrong. diff --git a/sys/dev/mii/ukphy_subr.c b/sys/dev/mii/ukphy_subr.c index 8250535095a4..1c082aeb545f 100644 --- a/sys/dev/mii/ukphy_subr.c +++ b/sys/dev/mii/ukphy_subr.c @@ -1,4 +1,4 @@ -/* $NetBSD: ukphy_subr.c,v 1.11 2009/02/16 08:00:42 cegger Exp $ */ +/* $NetBSD: ukphy_subr.c,v 1.12 2014/06/16 14:43:22 msaitoh Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ukphy_subr.c,v 1.11 2009/02/16 08:00:42 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ukphy_subr.c,v 1.12 2014/06/16 14:43:22 msaitoh Exp $"); #include #include @@ -92,7 +92,7 @@ ukphy_status(struct mii_softc *phy) anlpar = PHY_READ(phy, MII_ANAR) & PHY_READ(phy, MII_ANLPAR); if ((phy->mii_flags & MIIF_HAVE_GTCR) != 0 && (phy->mii_extcapabilities & - (EXTSR_1000THDX|EXTSR_1000TFDX)) != 0) { + (EXTSR_1000THDX | EXTSR_1000TFDX)) != 0) { gtcr = PHY_READ(phy, MII_100T2CR); gtsr = PHY_READ(phy, MII_100T2SR); } else