28c28
< __FBSDID("$FreeBSD: head/sys/dev/mii/axphy.c 213893 2010-10-15 14:52:11Z marius $");
---
> __FBSDID("$FreeBSD: head/sys/dev/mii/axphy.c 221407 2011-05-03 19:51:29Z marius $");
76c76
< MII_PHY_DESC(ASIX, AX88X9X),
---
> MII_PHY_DESC(xxASIX, AX88X9X),
79a80,85
> static const struct mii_phy_funcs axphy_funcs = {
> axphy_service,
> axphy_status,
> mii_phy_reset
> };
>
91,92d96
< struct mii_attach_args *ma;
< struct mii_data *mii;
95,98d98
< 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);
100,115c100,101
< sc->mii_flags = miibus_get_flags(dev);
< sc->mii_inst = mii->mii_instance++;
< sc->mii_phy = ma->mii_phyno;
< sc->mii_service = axphy_service;
< sc->mii_pdata = mii;
<
< sc->mii_flags |= MIIF_NOISOLATE;
<
< mii_phy_reset(sc);
<
< sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask;
< device_printf(dev, " ");
< mii_phy_add_media(sc);
< printf("\n");
<
< MIIBUS_MEDIAINIT(sc->mii_dev);
---
> mii_phy_dev_attach(dev, MIIF_NOISOLATE | MIIF_NOMANPAUSE,
> &axphy_funcs, 1);
146c132
< axphy_status(sc);
---
> PHY_STATUS(sc);
190c176,177
< mii->mii_media_active |= IFM_FDX;
---
> mii->mii_media_active |=
> IFM_FDX | mii_phy_flowstatus(sc);