29c29
< __FBSDID("$FreeBSD: head/sys/dev/mii/jmphy.c 217414 2011-01-14 19:33:58Z marius $");
---
> __FBSDID("$FreeBSD: head/sys/dev/mii/jmphy.c 221407 2011-05-03 19:51:29Z marius $");
59,65d58
< struct jmphy_softc {
< struct mii_softc mii_sc;
< int mii_oui;
< int mii_model;
< int mii_rev;
< };
<
79c72
< sizeof(struct jmphy_softc)
---
> sizeof(struct mii_softc)
92a86,91
> static const struct mii_phy_funcs jmphy_funcs = {
> jmphy_service,
> jmphy_status,
> jmphy_reset
> };
>
103,104d101
< struct jmphy_softc *jsc;
< struct mii_softc *sc;
106,107c103
< struct mii_data *mii;
< struct ifnet *ifp;
---
> u_int flags;
109,110d104
< jsc = device_get_softc(dev);
< sc = &jsc->mii_sc;
112,142c106,110
< sc->mii_dev = device_get_parent(dev);
< mii = ma->mii_data;
< LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);
<
< sc->mii_flags = miibus_get_flags(dev);
< sc->mii_inst = mii->mii_instance++;
< sc->mii_phy = ma->mii_phyno;
< sc->mii_service = jmphy_service;
< sc->mii_pdata = mii;
<
< ifp = sc->mii_pdata->mii_ifp;
< if (strcmp(ifp->if_dname, "jme") == 0 &&
< (sc->mii_flags & MIIF_MACPRIV0) != 0)
< sc->mii_flags |= MIIF_PHYPRIV0;
< jsc->mii_oui = MII_OUI(ma->mii_id1, ma->mii_id2);
< jsc->mii_model = MII_MODEL(ma->mii_id2);
< jsc->mii_rev = MII_REV(ma->mii_id2);
< if (bootverbose)
< device_printf(dev, "OUI 0x%06x, model 0x%04x, rev. %d\n",
< jsc->mii_oui, jsc->mii_model, jsc->mii_rev);
<
< jmphy_reset(sc);
<
< sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->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);
---
> flags = 0;
> if (strcmp(ma->mii_data->mii_ifp->if_dname, "jme") == 0 &&
> (miibus_get_flags(dev) & MIIF_MACPRIV0) != 0)
> flags |= MIIF_PHYPRIV0;
> mii_phy_dev_attach(dev, flags, &jmphy_funcs, 1);
199c167
< jmphy_status(sc);
---
> PHY_STATUS(sc);
272d239
< struct jmphy_softc *jsc;
276,277d242
< jsc = (struct jmphy_softc *)sc;
<
372,374d336
< if ((ife->ifm_media & IFM_LOOP) != 0)
< bmcr |= BMCR_LOOP;
<