34c34
< __FBSDID("$FreeBSD: head/sys/dev/mii/mii_physubr.c 220938 2011-04-22 09:22:27Z marius $");
---
> __FBSDID("$FreeBSD: head/sys/dev/mii/mii_physubr.c 221407 2011-05-03 19:51:29Z marius $");
153,155d152
< if ((ife->ifm_media & IFM_LOOP) != 0)
< bmcr |= BMCR_LOOP;
<
254c251
< mii_phy_reset(sc);
---
> PHY_RESET(sc);
335c332
< if ((sc->mii_flags & MIIF_NOISOLATE) == 0)
---
> if ((sc->mii_flags & MIIF_NOISOLATE) == 0) {
337a335,336
> PRINT("none");
> }
523a523,566
> void
> mii_phy_dev_attach(device_t dev, u_int flags, const struct mii_phy_funcs *mpf,
> int add_media)
> {
> struct mii_softc *sc;
> struct mii_attach_args *ma;
> struct mii_data *mii;
>
> sc = device_get_softc(dev);
> ma = device_get_ivars(dev);
> sc->mii_dev = device_get_parent(dev);
> mii = ma->mii_data;
> LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);
>
> sc->mii_flags = flags | miibus_get_flags(dev);
> sc->mii_mpd_oui = MII_OUI(ma->mii_id1, ma->mii_id2);
> sc->mii_mpd_model = MII_MODEL(ma->mii_id2);
> sc->mii_mpd_rev = MII_REV(ma->mii_id2);
> sc->mii_capmask = ma->mii_capmask;
> sc->mii_inst = mii->mii_instance++;
> sc->mii_phy = ma->mii_phyno;
> sc->mii_offset = ma->mii_offset;
> sc->mii_funcs = mpf;
> sc->mii_pdata = mii;
>
> if (bootverbose)
> device_printf(dev, "OUI 0x%06x, model 0x%04x, rev. %d\n",
> sc->mii_mpd_oui, sc->mii_mpd_model, sc->mii_mpd_rev);
>
> if (add_media == 0)
> return;
>
> PHY_RESET(sc);
>
> sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & sc->mii_capmask;
> if (sc->mii_capabilities & BMSR_EXTSTAT)
> sc->mii_extcapabilities = PHY_READ(sc, MII_EXTSR);
> device_printf(dev, " ");
> mii_phy_add_media(sc);
> printf("\n");
>
> MIIBUS_MEDIAINIT(sc->mii_dev);
> }
>