diff options
Diffstat (limited to 'sys/dev/mii/nsphy.c')
| -rw-r--r-- | sys/dev/mii/nsphy.c | 46 |
1 files changed, 6 insertions, 40 deletions
diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c index f0c13361e932..3b70ac30670c 100644 --- a/sys/dev/mii/nsphy.c +++ b/sys/dev/mii/nsphy.c @@ -118,8 +118,8 @@ static driver_t nsphy_driver = { DRIVER_MODULE(nsphy, miibus, nsphy_driver, nsphy_devclass, 0, 0); -int nsphy_service __P((struct mii_softc *, struct mii_data *, int)); -void nsphy_status __P((struct mii_softc *)); +static int nsphy_service __P((struct mii_softc *, struct mii_data *, int)); +static void nsphy_status __P((struct mii_softc *)); static int nsphy_probe(dev) device_t dev; @@ -208,7 +208,7 @@ static int nsphy_detach(dev) return(0); } -int +static int nsphy_service(sc, mii, cmd) struct mii_softc *sc; struct mii_data *mii; @@ -310,38 +310,7 @@ nsphy_service(sc, mii, cmd) */ if (IFM_INST(ife->ifm_media) != sc->mii_inst) return (0); - - /* - * 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); - - /* - * Check to see if we have link. If we do, we don't - * need to restart the autonegotiation process. Read - * the BMSR twice in case it's latched. - */ - reg = PHY_READ(sc, MII_BMSR) | - PHY_READ(sc, MII_BMSR); - if (reg & BMSR_LINK) - return (0); - - /* - * Only retry autonegotiation every 5 seconds. - */ - if (++sc->mii_ticks != 5) - return (0); - - sc->mii_ticks = 0; - mii_phy_reset(sc); - if (mii_phy_auto(sc, 0) == EJUSTRETURN) + if (mii_phy_tick(sc) == EJUSTRETURN) return (0); break; } @@ -350,14 +319,11 @@ nsphy_service(sc, mii, cmd) nsphy_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 nsphy_status(sc) struct mii_softc *sc; { |