diff options
| author | jlemon <jlemon@FreeBSD.org> | 2001-09-29 19:18:52 +0000 |
|---|---|---|
| committer | jlemon <jlemon@FreeBSD.org> | 2001-09-29 19:18:52 +0000 |
| commit | 6689cad44720247770c3439271c41126ceb5476e (patch) | |
| tree | e747bfa7e8d363f3c895759cfbfa10fc7ec0841e /sys/dev/mii/rlphy.c | |
| parent | 8bad7ad549c81c7741eb484b254cbe6200cba4c3 (diff) | |
| download | FreeBSD-src-6689cad44720247770c3439271c41126ceb5476e.zip FreeBSD-src-6689cad44720247770c3439271c41126ceb5476e.tar.gz | |
Cleanup pass for mii drivers.
. Make internal service routines static.
. Use a consistent ordering of checks in MII_TICK. Do the work in the
mii_phy_tick() subroutine if appropriate.
. Call mii_phy_update() to trigger the callbacks.
Diffstat (limited to 'sys/dev/mii/rlphy.c')
| -rw-r--r-- | sys/dev/mii/rlphy.c | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/sys/dev/mii/rlphy.c b/sys/dev/mii/rlphy.c index 0a0e375..f6a4436 100644 --- a/sys/dev/mii/rlphy.c +++ b/sys/dev/mii/rlphy.c @@ -78,8 +78,8 @@ static driver_t rlphy_driver = { DRIVER_MODULE(rlphy, miibus, rlphy_driver, rlphy_devclass, 0, 0); -int rlphy_service __P((struct mii_softc *, struct mii_data *, int)); -void rlphy_reset __P((struct mii_softc *)); +static int rlphy_service __P((struct mii_softc *, struct mii_data *, int)); +static void rlphy_reset __P((struct mii_softc *)); static int rlphy_probe(dev) device_t dev; @@ -181,7 +181,7 @@ static int rlphy_detach(dev) return(0); } -int +static int rlphy_service(sc, mii, cmd) struct mii_softc *sc; struct mii_data *mii; @@ -232,24 +232,16 @@ rlphy_service(sc, mii, cmd) case MII_TICK: /* - * Only used for autonegotiation. - */ - if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) - return (0); - - /* * Is the interface even up? */ if ((mii->mii_ifp->if_flags & IFF_UP) == 0) return (0); /* - * Only retry autonegotiation every 5 seconds. + * Only used for autonegotiation. */ - if (++sc->mii_ticks != 5) - return (0); - - sc->mii_ticks = 0; + if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) + break; /* * The RealTek PHY's autonegotiation doesn't need to be @@ -262,14 +254,11 @@ rlphy_service(sc, mii, cmd) ukphy_status(sc); /* Callback if something changed. */ - if (sc->mii_active != mii->mii_media_active || cmd == MII_MEDIACHG) { - MIIBUS_STATCHG(sc->mii_dev); - sc->mii_active = mii->mii_media_active; - } + mii_phy_update(sc, cmd); return (0); } -void +static void rlphy_reset(sc) struct mii_softc *sc; { |
