From owner-svn-src-all@FreeBSD.ORG Thu Mar 19 15:16:05 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ECEE2106568D; Thu, 19 Mar 2009 15:16:05 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D8B588FC0C; Thu, 19 Mar 2009 15:16:05 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2JFG5Z7066325; Thu, 19 Mar 2009 15:16:05 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2JFG5Vx066323; Thu, 19 Mar 2009 15:16:05 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <200903191516.n2JFG5Vx066323@svn.freebsd.org> From: Marius Strobl Date: Thu, 19 Mar 2009 15:16:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r190064 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb dev/dc X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Mar 2009 15:16:07 -0000 Author: marius Date: Thu Mar 19 15:16:05 2009 New Revision: 190064 URL: http://svn.freebsd.org/changeset/base/190064 Log: MFC: r183505 cosmetic changes and style fixes Modified: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/ath/ath_hal/ (props changed) stable/7/sys/dev/cxgb/ (props changed) stable/7/sys/dev/dc/dcphy.c stable/7/sys/dev/dc/pnphy.c Modified: stable/7/sys/dev/dc/dcphy.c ============================================================================== --- stable/7/sys/dev/dc/dcphy.c Thu Mar 19 15:08:35 2009 (r190063) +++ stable/7/sys/dev/dc/dcphy.c Thu Mar 19 15:16:05 2009 (r190064) @@ -35,9 +35,9 @@ __FBSDID("$FreeBSD$"); /* * Pseudo-driver for internal NWAY support on DEC 21143 and workalike - * controllers. Technically we're abusing the miibus code to handle + * controllers. Technically we're abusing the miibus code to handle * media selection and NWAY support here since there is no MII - * interface. However the logical operations are roughly the same, + * interface. However the logical operations are roughly the same, * and the alternative is to create a fake MII interface in the driver, * which is harder to do. */ @@ -82,7 +82,7 @@ __FBSDID("$FreeBSD$"); /* * This is the subsystem ID for the built-in 21143 ethernet - * in several Compaq Presario systems. Apparently these are + * in several Compaq Presario systems. Apparently these are * 10Mbps only, so we need to treat them specially. */ #define COMPAQ_PRESARIO_ID 0xb0bb0e11 @@ -127,7 +127,7 @@ dcphy_probe(device_t dev) */ if (ma->mii_id1 != DC_VENDORID_DEC || ma->mii_id2 != DC_DEVICEID_21143) - return(ENXIO); + return (ENXIO); device_set_desc(dev, "Intel 21143 NWAY media interface"); @@ -171,20 +171,16 @@ dcphy_attach(device_t dev) switch (pci_get_subdevice(brdev) << 16 | pci_get_subvendor(brdev)) { case COMPAQ_PRESARIO_ID: /* Example of how to only allow 10Mbps modes. */ - sc->mii_capabilities = BMSR_ANEG|BMSR_10TFDX|BMSR_10THDX; + sc->mii_capabilities = BMSR_ANEG | BMSR_10TFDX | BMSR_10THDX; break; default: - if (dc_sc->dc_pmode == DC_PMODE_SIA) { + if (dc_sc->dc_pmode == DC_PMODE_SIA) sc->mii_capabilities = - BMSR_ANEG|BMSR_10TFDX|BMSR_10THDX; - } else { - ADD(IFM_MAKEWORD(IFM_ETHER, IFM_100_TX, IFM_LOOP, - sc->mii_inst), BMCR_LOOP|BMCR_S100); - + BMSR_ANEG | BMSR_10TFDX | BMSR_10THDX; + else sc->mii_capabilities = - BMSR_ANEG|BMSR_100TXFDX|BMSR_100TXHDX| - BMSR_10TFDX|BMSR_10THDX; - } + BMSR_ANEG | BMSR_100TXFDX | BMSR_100TXHDX | + BMSR_10TFDX | BMSR_10THDX; break; } @@ -195,7 +191,7 @@ dcphy_attach(device_t dev) #undef ADD MIIBUS_MEDIAINIT(sc->mii_dev); - return(0); + return (0); } static int @@ -213,9 +209,8 @@ dcphy_service(struct mii_softc *sc, stru /* * If we're not polling our PHY instance, just return. */ - if (IFM_INST(ife->ifm_media) != sc->mii_inst) { + if (IFM_INST(ife->ifm_media) != sc->mii_inst) return (0); - } break; case MII_MEDIACHG: @@ -223,9 +218,8 @@ dcphy_service(struct mii_softc *sc, stru * If the media indicates a different PHY instance, * isolate ourselves. */ - if (IFM_INST(ife->ifm_media) != sc->mii_inst) { + if (IFM_INST(ife->ifm_media) != sc->mii_inst) return (0); - } /* * If the interface is not up, don't do anything. @@ -236,8 +230,8 @@ dcphy_service(struct mii_softc *sc, stru sc->mii_flags = 0; mii->mii_media_active = IFM_NONE; mode = CSR_READ_4(dc_sc, DC_NETCFG); - mode &= ~(DC_NETCFG_FULLDUPLEX|DC_NETCFG_PORTSEL| - DC_NETCFG_PCS|DC_NETCFG_SCRAMBLER|DC_NETCFG_SPEEDSEL); + mode &= ~(DC_NETCFG_FULLDUPLEX | DC_NETCFG_PORTSEL | + DC_NETCFG_PCS | DC_NETCFG_SCRAMBLER | DC_NETCFG_SPEEDSEL); switch (IFM_SUBTYPE(ife->ifm_media)) { case IFM_AUTO: @@ -252,7 +246,7 @@ dcphy_service(struct mii_softc *sc, stru case IFM_100_TX: dcphy_reset(sc); DC_CLRBIT(dc_sc, DC_10BTCTRL, DC_TCTL_AUTONEGENBL); - mode |= DC_NETCFG_PORTSEL|DC_NETCFG_PCS| + mode |= DC_NETCFG_PORTSEL | DC_NETCFG_PCS | DC_NETCFG_SCRAMBLER; if ((ife->ifm_media & IFM_GMASK) == IFM_FDX) mode |= DC_NETCFG_FULLDUPLEX; @@ -278,7 +272,7 @@ dcphy_service(struct mii_softc *sc, stru CSR_WRITE_4(dc_sc, DC_NETCFG, mode); break; default: - return(EINVAL); + return (EINVAL); } break; @@ -366,7 +360,7 @@ dcphy_status(struct mii_softc *sc) anlpar = tstat >> 16; if (anlpar & ANLPAR_TX_FD && sc->mii_capabilities & BMSR_100TXFDX) - mii->mii_media_active |= IFM_100_TX|IFM_FDX; + mii->mii_media_active |= IFM_100_TX | IFM_FDX; else if (anlpar & ANLPAR_T4 && sc->mii_capabilities & BMSR_100T4) mii->mii_media_active |= IFM_100_T4; @@ -374,7 +368,7 @@ dcphy_status(struct mii_softc *sc) sc->mii_capabilities & BMSR_100TXHDX) mii->mii_media_active |= IFM_100_TX; else if (anlpar & ANLPAR_10_FD) - mii->mii_media_active |= IFM_10_T|IFM_FDX; + mii->mii_media_active |= IFM_10_T | IFM_FDX; else if (anlpar & ANLPAR_10) mii->mii_media_active |= IFM_10_T; else @@ -384,10 +378,11 @@ dcphy_status(struct mii_softc *sc) DC_TCTL_AUTONEGENBL); return; } + /* * 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. @@ -404,15 +399,12 @@ dcphy_status(struct mii_softc *sc) } skip: - if (CSR_READ_4(dc_sc, DC_NETCFG) & DC_NETCFG_SPEEDSEL) mii->mii_media_active |= IFM_10_T; else mii->mii_media_active |= IFM_100_TX; if (CSR_READ_4(dc_sc, DC_NETCFG) & DC_NETCFG_FULLDUPLEX) mii->mii_media_active |= IFM_FDX; - - return; } static int @@ -433,7 +425,7 @@ dcphy_auto(struct mii_softc *mii) DC_SETBIT(sc, DC_10BTCTRL, DC_TCTL_AUTONEGENBL); DC_SETBIT(sc, DC_10BTSTAT, DC_ASTAT_TXDISABLE); - return(EJUSTRETURN); + return (EJUSTRETURN); } static void @@ -446,7 +438,4 @@ dcphy_reset(struct mii_softc *mii) DC_CLRBIT(sc, DC_SIARESET, DC_SIA_RESET); DELAY(1000); DC_SETBIT(sc, DC_SIARESET, DC_SIA_RESET); - - return; } - Modified: stable/7/sys/dev/dc/pnphy.c ============================================================================== --- stable/7/sys/dev/dc/pnphy.c Thu Mar 19 15:08:35 2009 (r190063) +++ stable/7/sys/dev/dc/pnphy.c Thu Mar 19 15:16:05 2009 (r190064) @@ -35,8 +35,8 @@ __FBSDID("$FreeBSD$"); /* * Pseudo-driver for media selection on the Lite-On PNIC 82c168 - * chip. The NWAY support on this chip is horribly broken, so we - * only support manual mode selection. This is lame, but getting + * chip. The NWAY support on this chip is horribly broken, so we + * only support manual mode selection. This is lame, but getting * NWAY to work right is amazingly difficult. */ @@ -112,7 +112,7 @@ pnphy_probe(device_t dev) */ if (ma->mii_id1 != DC_VENDORID_LO || ma->mii_id2 != DC_DEVICEID_82C168) - return(ENXIO); + return (ENXIO); device_set_desc(dev, "PNIC 82c168 media interface"); @@ -143,7 +143,7 @@ pnphy_attach(device_t dev) #define ADD(m, c) ifmedia_add(&mii->mii_media, (m), (c), NULL) sc->mii_capabilities = - BMSR_100TXFDX|BMSR_100TXHDX|BMSR_10TFDX|BMSR_10THDX; + BMSR_100TXFDX | BMSR_100TXHDX | BMSR_10TFDX | BMSR_10THDX; sc->mii_capabilities &= ma->mii_capmask; device_printf(dev, " "); mii_add_media(sc); @@ -157,7 +157,7 @@ pnphy_attach(device_t dev) #undef ADD MIIBUS_MEDIAINIT(sc->mii_dev); - return(0); + return (0); } static int @@ -170,9 +170,8 @@ pnphy_service(struct mii_softc *sc, stru /* * If we're not polling our PHY instance, just return. */ - if (IFM_INST(ife->ifm_media) != sc->mii_inst) { + if (IFM_INST(ife->ifm_media) != sc->mii_inst) return (0); - } break; case MII_MEDIACHG: @@ -200,19 +199,19 @@ pnphy_service(struct mii_softc *sc, stru */ return (EINVAL); case IFM_100_TX: - mii->mii_media_active = IFM_ETHER|IFM_100_TX; + mii->mii_media_active = IFM_ETHER | IFM_100_TX; if ((ife->ifm_media & IFM_GMASK) == IFM_FDX) mii->mii_media_active |= IFM_FDX; MIIBUS_STATCHG(sc->mii_dev); - return(0); + return (0); case IFM_10_T: - mii->mii_media_active = IFM_ETHER|IFM_10_T; + mii->mii_media_active = IFM_ETHER | IFM_10_T; if ((ife->ifm_media & IFM_GMASK) == IFM_FDX) mii->mii_media_active |= IFM_FDX; MIIBUS_STATCHG(sc->mii_dev); - return(0); + return (0); default: - return(EINVAL); + return (EINVAL); } break; @@ -263,6 +262,4 @@ pnphy_status(struct mii_softc *sc) mii->mii_media_active |= IFM_100_TX; if (CSR_READ_4(dc_sc, DC_NETCFG) & DC_NETCFG_FULLDUPLEX) mii->mii_media_active |= IFM_FDX; - - return; }