58c58
< __FBSDID("$FreeBSD: head/sys/dev/mii/exphy.c 213893 2010-10-15 14:52:11Z marius $");
---
> __FBSDID("$FreeBSD: head/sys/dev/mii/exphy.c 221407 2011-05-03 19:51:29Z marius $");
114c114
< MII_PHY_DESC(BROADCOM, 3C905C),
---
> MII_PHY_DESC(xxBROADCOM, 3C905C),
117c117,123
<
---
>
> static const struct mii_phy_funcs exphy_funcs = {
> exphy_service,
> ukphy_status,
> exphy_reset
> };
>
131,133d136
< struct mii_softc *sc;
< struct mii_attach_args *ma;
< struct mii_data *mii;
135,146d137
< 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 = miibus_get_flags(dev);
< sc->mii_inst = mii->mii_instance++;
< sc->mii_phy = ma->mii_phyno;
< sc->mii_service = exphy_service;
< sc->mii_pdata = mii;
<
150,164c141,142
< sc->mii_flags |= MIIF_NOISOLATE;
<
< #define ADD(m, c) ifmedia_add(&mii->mii_media, (m), (c), NULL)
<
< ADD(IFM_MAKEWORD(IFM_ETHER, IFM_100_TX, IFM_LOOP, sc->mii_inst),
< MII_MEDIA_100_TX);
<
< exphy_reset(sc);
<
< sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask;
< device_printf(dev, " ");
< mii_phy_add_media(sc);
< printf("\n");
< #undef ADD
< MIIBUS_MEDIAINIT(sc->mii_dev);
---
> mii_phy_dev_attach(dev, MIIF_NOISOLATE | MIIF_NOMANPAUSE,
> &exphy_funcs, 1);
201c179
< ukphy_status(sc);
---
> PHY_STATUS(sc);