41c41
< __FBSDID("$FreeBSD: head/sys/dev/mii/nsgphy.c 216623 2010-12-21 21:12:18Z marius $");
---
> __FBSDID("$FreeBSD: head/sys/dev/mii/nsgphy.c 221407 2011-05-03 19:51:29Z marius $");
103,105c103,105
< MII_PHY_DESC(NATSEMI, DP83861),
< MII_PHY_DESC(NATSEMI, DP83865),
< MII_PHY_DESC(NATSEMI, DP83891),
---
> MII_PHY_DESC(xxNATSEMI, DP83861),
> MII_PHY_DESC(xxNATSEMI, DP83865),
> MII_PHY_DESC(xxNATSEMI, DP83891),
108a109,114
> static const struct mii_phy_funcs nsgphy_funcs = {
> nsgphy_service,
> nsgphy_status,
> mii_phy_reset
> };
>
120,121d125
< struct mii_attach_args *ma;
< struct mii_data *mii;
124,130d127
< ma = device_get_ivars(dev);
< if (bootverbose)
< device_printf(dev, "<rev. %d>\n", MII_REV(ma->mii_id2));
< device_printf(dev, " ");
< sc->mii_dev = device_get_parent(dev);
< mii = ma->mii_data;
< LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);
132,136c129
< sc->mii_flags = miibus_get_flags(dev);
< sc->mii_inst = mii->mii_instance++;
< sc->mii_phy = ma->mii_phyno;
< sc->mii_service = nsgphy_service;
< sc->mii_pdata = mii;
---
> mii_phy_dev_attach(dev, MIIF_NOMANPAUSE, &nsgphy_funcs, 0);
138c131
< sc->mii_flags |= MIIF_NOMANPAUSE;
---
> PHY_RESET(sc);
140,141d132
< mii_phy_reset(sc);
<
147c138
< BMSR_10TFDX | BMSR_10THDX) & ma->mii_capmask;
---
> BMSR_10TFDX | BMSR_10THDX) & sc->mii_capmask;
187c178
< nsgphy_status(sc);
---
> PHY_STATUS(sc);