33c33
< __FBSDID("$FreeBSD: head/sys/dev/mii/e1000phy.c 220938 2011-04-22 09:22:27Z marius $");
---
> __FBSDID("$FreeBSD: head/sys/dev/mii/e1000phy.c 221407 2011-05-03 19:51:29Z marius $");
68,72d67
< struct e1000phy_softc {
< struct mii_softc mii_sc;
< int mii_model;
< };
<
86c81
< sizeof(struct e1000phy_softc)
---
> sizeof(struct mii_softc)
94c89
< static int e1000phy_mii_phy_auto(struct e1000phy_softc *, int);
---
> static int e1000phy_mii_phy_auto(struct mii_softc *, int);
100d94
< MII_PHY_DESC(MARVELL, E1000S),
102,105d95
< MII_PHY_DESC(MARVELL, E1101),
< MII_PHY_DESC(MARVELL, E3082),
< MII_PHY_DESC(MARVELL, E1112),
< MII_PHY_DESC(MARVELL, E1149),
107,111d96
< MII_PHY_DESC(MARVELL, E1116),
< MII_PHY_DESC(MARVELL, E1116R),
< MII_PHY_DESC(MARVELL, E1118),
< MII_PHY_DESC(MARVELL, E3016),
< MII_PHY_DESC(MARVELL, PHYG65G),
114a100
> MII_PHY_DESC(xxMARVELL, E1000S),
115a102,105
> MII_PHY_DESC(xxMARVELL, E1101),
> MII_PHY_DESC(xxMARVELL, E3082),
> MII_PHY_DESC(xxMARVELL, E1112),
> MII_PHY_DESC(xxMARVELL, E1149),
116a107,111
> MII_PHY_DESC(xxMARVELL, E1116),
> MII_PHY_DESC(xxMARVELL, E1116R),
> MII_PHY_DESC(xxMARVELL, E1118),
> MII_PHY_DESC(xxMARVELL, E3016),
> MII_PHY_DESC(xxMARVELL, PHYG65G),
119a115,120
> static const struct mii_phy_funcs e1000phy_funcs = {
> e1000phy_service,
> e1000phy_status,
> e1000phy_reset
> };
>
130d130
< struct e1000phy_softc *esc;
132,133d131
< struct mii_attach_args *ma;
< struct mii_data *mii;
136,141c134
< esc = device_get_softc(dev);
< sc = &esc->mii_sc;
< 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 = device_get_softc(dev);
143,147c136
< sc->mii_flags = miibus_get_flags(dev);
< sc->mii_inst = mii->mii_instance++;
< sc->mii_phy = ma->mii_phyno;
< sc->mii_service = e1000phy_service;
< sc->mii_pdata = mii;
---
> mii_phy_dev_attach(dev, MIIF_NOMANPAUSE, &e1000phy_funcs, 0);
149,151d137
< sc->mii_flags |= MIIF_NOMANPAUSE;
<
< esc->mii_model = MII_MODEL(ma->mii_id2);
157,159c143,145
< switch (esc->mii_model) {
< case MII_MODEL_MARVELL_E1011:
< case MII_MODEL_MARVELL_E1112:
---
> switch (sc->mii_mpd_model) {
> case MII_MODEL_xxMARVELL_E1011:
> case MII_MODEL_xxMARVELL_E1112:
163c149
< case MII_MODEL_MARVELL_E1149:
---
> case MII_MODEL_xxMARVELL_E1149:
179c165
< e1000phy_reset(sc);
---
> PHY_RESET(sc);
181c167
< sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask;
---
> sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & sc->mii_capmask;
195d180
< struct e1000phy_softc *esc;
198d182
< esc = (struct e1000phy_softc *)sc;
203c187
< if (esc->mii_model == MII_MODEL_MARVELL_E1112) {
---
> if (sc->mii_mpd_model == MII_MODEL_xxMARVELL_E1112) {
221,227c205,211
< switch (esc->mii_model) {
< case MII_MODEL_MARVELL_E1111:
< case MII_MODEL_MARVELL_E1112:
< case MII_MODEL_MARVELL_E1116:
< case MII_MODEL_MARVELL_E1118:
< case MII_MODEL_MARVELL_E1149:
< case MII_MODEL_MARVELL_PHYG65G:
---
> switch (sc->mii_mpd_model) {
> case MII_MODEL_xxMARVELL_E1111:
> case MII_MODEL_xxMARVELL_E1112:
> case MII_MODEL_xxMARVELL_E1116:
> case MII_MODEL_xxMARVELL_E1118:
> case MII_MODEL_xxMARVELL_E1149:
> case MII_MODEL_xxMARVELL_PHYG65G:
231c215
< if (esc->mii_model == MII_MODEL_MARVELL_E1116)
---
> if (sc->mii_mpd_model == MII_MODEL_xxMARVELL_E1116)
235c219
< case MII_MODEL_MARVELL_E3082:
---
> case MII_MODEL_xxMARVELL_E3082:
239c223
< case MII_MODEL_MARVELL_E3016:
---
> case MII_MODEL_xxMARVELL_E3016:
252c236
< if (esc->mii_model != MII_MODEL_MARVELL_E3016) {
---
> if (sc->mii_mpd_model != MII_MODEL_xxMARVELL_E3016) {
258,259c242,243
< if (esc->mii_model == MII_MODEL_MARVELL_E1116 ||
< esc->mii_model == MII_MODEL_MARVELL_E1149) {
---
> if (sc->mii_mpd_model == MII_MODEL_xxMARVELL_E1116 ||
> sc->mii_mpd_model == MII_MODEL_xxMARVELL_E1149) {
268,271c252,255
< switch (esc->mii_model) {
< case MII_MODEL_MARVELL_E3082:
< case MII_MODEL_MARVELL_E1112:
< case MII_MODEL_MARVELL_E1118:
---
> switch (sc->mii_mpd_model) {
> case MII_MODEL_xxMARVELL_E3082:
> case MII_MODEL_xxMARVELL_E1112:
> case MII_MODEL_xxMARVELL_E1118:
273c257
< case MII_MODEL_MARVELL_E1116:
---
> case MII_MODEL_xxMARVELL_E1116:
287c271
< case MII_MODEL_MARVELL_E3016:
---
> case MII_MODEL_xxMARVELL_E3016:
312d295
< struct e1000phy_softc *esc = (struct e1000phy_softc *)sc;
328c311
< e1000phy_mii_phy_auto(esc, ife->ifm_media);
---
> e1000phy_mii_phy_auto(sc, ife->ifm_media);
415,416c398,399
< e1000phy_reset(sc);
< e1000phy_mii_phy_auto(esc, ife->ifm_media);
---
> PHY_RESET(sc);
> e1000phy_mii_phy_auto(sc, ife->ifm_media);
421c404
< e1000phy_status(sc);
---
> PHY_STATUS(sc);
492c475
< e1000phy_mii_phy_auto(struct e1000phy_softc *esc, int media)
---
> e1000phy_mii_phy_auto(struct mii_softc *sc, int media)
494d476
< struct mii_softc *sc;
497d478
< sc = &esc->mii_sc;