Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Delint somewhat.

Browse Source
This commit is contained in:
uwe 2002-05-07 04:52:49 +00:00
parent a19e4685f7
commit 41e6fbc398
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/mii/mii_physubr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mii_physubr.c,v 1.30 2001/11/13 07:41:37 lukem Exp $ */
/* $NetBSD: mii_physubr.c,v 1.31 2002/05/07 04:52:49 uwe Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mii_physubr.c,v 1.30 2001/11/13 07:41:37 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: mii_physubr.c,v 1.31 2002/05/07 04:52:49 uwe Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -155,7 +155,7 @@ mii_phy_setmedia(struct mii_softc *sc)
int
mii_phy_auto(struct mii_softc *sc, int waitfor)
{
int bmsr, i;
int i;
if ((sc->mii_flags & MIIF_DOINGAUTO) == 0) {
/*
@ -201,7 +201,7 @@ mii_phy_auto(struct mii_softc *sc, int waitfor)
if (waitfor) {
/* Wait 500ms for it to complete. */
for (i = 0; i < 500; i++) {
if ((bmsr = PHY_READ(sc, MII_BMSR)) & BMSR_ACOMP)
if (PHY_READ(sc, MII_BMSR) & BMSR_ACOMP)
return (0);
delay(1000);
}
@ -235,14 +235,13 @@ void
mii_phy_auto_timeout(void *arg)
{
struct mii_softc *sc = arg;
int s, bmsr;
int s;
if ((sc->mii_dev.dv_flags & DVF_ACTIVE) == 0)
return;
s = splnet();
sc->mii_flags &= ~MIIF_DOINGAUTO;
bmsr = PHY_READ(sc, MII_BMSR);
/* Update the media status. */
(void) PHY_SERVICE(sc, sc->mii_pdata, MII_POLLSTAT);
@ -404,7 +403,7 @@ mii_phy_add_media(struct mii_softc *sc)
const char *sep = "";
#define ADD(m, c) ifmedia_add(&mii->mii_media, (m), (c), NULL)
#define PRINT(s) printf("%s%s", sep, s); sep = ", "
#define PRINT(n) printf("%s%s", sep, (n)); sep = ", "
if ((sc->mii_flags & MIIF_NOISOLATE) == 0)
ADD(IFM_MAKEWORD(IFM_ETHER, IFM_NONE, 0, sc->mii_inst),
@ -536,6 +535,7 @@ mii_phy_activate(struct device *self, enum devact act)
return (rv);
}
/* ARGSUSED1 */
int
mii_phy_detach(struct device *self, int flags)
{