35c35
< * $FreeBSD: head/sys/dev/mii/truephy.c 213893 2010-10-15 14:52:11Z marius $
---
> * $FreeBSD: head/sys/dev/mii/truephy.c 221407 2011-05-03 19:51:29Z marius $
93a94,99
> static const struct mii_phy_funcs truephy_funcs = {
> truephy_service,
> truephy_status,
> truephy_reset
> };
>
143,144d148
< struct mii_attach_args *ma;
< struct mii_data *mii;
147d150
< ma = device_get_ivars(dev);
149,152c152,153
< sc->mii_phy = ma->mii_phyno;
< sc->mii_dev = device_get_parent(dev);
< mii = ma->mii_data;
< LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);
---
> mii_phy_dev_attach(dev, MIIF_NOISOLATE | MIIF_NOMANPAUSE,
> &truephy_funcs, 0);
154,158c155
< sc->mii_flags = miibus_get_flags(dev);
< sc->mii_inst = mii->mii_instance++;
< sc->mii_phy = ma->mii_phyno;
< sc->mii_service = truephy_service;
< sc->mii_pdata = mii;
---
> PHY_RESET(sc);
160,167c157
< sc->mii_flags |= MIIF_NOISOLATE | MIIF_NOLOOP;
<
< if (MII_MODEL(ma->mii_id2) == MII_MODEL_AGERE_ET1011)
< mii_phy_reset(sc);
< else
< truephy_reset(sc);
<
< sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask;
---
> sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & sc->mii_capmask;
213c203
< bmcr | BMCR_AUTOEN | BMCR_STARTNEG);
---
> bmcr | BMCR_AUTOEN | BMCR_STARTNEG);
225c215
< truephy_status(sc);
---
> PHY_STATUS(sc);
236a227,231
> if (sc->mii_mpd_model == MII_MODEL_AGERE_ET1011) {
> mii_phy_reset(sc);
> return;
> }
>
329c324
< mii->mii_media_active |= IFM_FDX;
---
> mii->mii_media_active |= IFM_FDX | mii_phy_flowstatus(sc);