65c65
< __FBSDID("$FreeBSD: head/sys/dev/mii/gentbi.c 215714 2010-11-22 21:20:11Z marius $");
---
> __FBSDID("$FreeBSD: head/sys/dev/mii/gentbi.c 221407 2011-05-03 19:51:29Z marius $");
113a114,119
> static const struct mii_phy_funcs gentbi_funcs = {
> gentbi_service,
> gentbi_status,
> mii_phy_reset
> };
>
155,156d160
< struct mii_attach_args *ma;
< struct mii_data *mii;
159,162d162
< 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);
164,167c164
< if (bootverbose)
< device_printf(dev, "OUI 0x%06x, model 0x%04x, rev. %d\n",
< MII_OUI(ma->mii_id1, ma->mii_id2),
< MII_MODEL(ma->mii_id2), MII_REV(ma->mii_id2));
---
> mii_phy_dev_attach(dev, MIIF_NOMANPAUSE, &gentbi_funcs, 0);
169,173c166
< sc->mii_flags = miibus_get_flags(dev);
< sc->mii_inst = mii->mii_instance++;
< sc->mii_phy = ma->mii_phyno;
< sc->mii_service = gentbi_service;
< sc->mii_pdata = mii;
---
> PHY_RESET(sc);
175,178d167
< sc->mii_flags |= MIIF_NOMANPAUSE;
<
< mii_phy_reset(sc);
<
184c173
< PHY_READ(sc, MII_BMSR) & ma->mii_capmask & ~BMSR_MEDIAMASK;
---
> PHY_READ(sc, MII_BMSR) & sc->mii_capmask & ~BMSR_MEDIAMASK;
221c210
< gentbi_status(sc);
---
> PHY_STATUS(sc);