diff options
author | Marius Strobl <marius@FreeBSD.org> | 2010-10-24 11:37:01 +0000 |
---|---|---|
committer | Marius Strobl <marius@FreeBSD.org> | 2010-10-24 11:37:01 +0000 |
commit | f6613deb1ff2cc15a603480c6f93523784740431 (patch) | |
tree | 6e89f235eb785d8c31b7ddb66bc5048a689eac52 /sys/dev/mii | |
parent | 6e4d736661e55467284b40925ded8fe453b7b5f8 (diff) | |
download | src-f6613deb1ff2cc15a603480c6f93523784740431.tar.gz src-f6613deb1ff2cc15a603480c6f93523784740431.zip |
- Take advantage of mii_phy_dev_probe().
- Use mii_phy_add_media() instead of mii_add_media(). I'm not sure how
this driver actually managed to work before as mii_add_media() is
intended to be used to gether with mii_anar() while mii_phy_add_media()
is intended to be used with mii_phy_setmedia(), however this driver
mii_add_media() along with mii_phy_setmedia().
Notes
Notes:
svn path=/head/; revision=214262
Diffstat (limited to 'sys/dev/mii')
-rw-r--r-- | sys/dev/mii/smcphy.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/sys/dev/mii/smcphy.c b/sys/dev/mii/smcphy.c index f356fdb7e94b..f442858eaa55 100644 --- a/sys/dev/mii/smcphy.c +++ b/sys/dev/mii/smcphy.c @@ -76,20 +76,16 @@ static driver_t smcphy_driver = { DRIVER_MODULE(smcphy, miibus, smcphy_driver, smcphy_devclass, 0, 0); +static const struct mii_phydesc smcphys[] = { + MII_PHY_DESC(SMSC, LAN83C183), + MII_PHY_END +}; + static int smcphy_probe(device_t dev) { - struct mii_attach_args *ma; - - ma = device_get_ivars(dev); - - if (MII_OUI(ma->mii_id1, ma->mii_id2) != MII_OUI_SMSC || - MII_MODEL(ma->mii_id2) != MII_MODEL_SMSC_LAN83C183) - return (ENXIO); - device_set_desc(dev, MII_STR_SMSC_LAN83C183); - - return (0); + return (mii_phy_dev_probe(dev, smcphys, BUS_PROBE_DEFAULT)); } static int @@ -111,7 +107,7 @@ smcphy_attach(device_t dev) sc->mii_service = smcphy_service; sc->mii_pdata = mii; - sc->mii_flags |= MIIF_NOISOLATE; + sc->mii_flags |= MIIF_NOISOLATE | MIIF_NOLOOP; if (smcphy_reset(sc) != 0) { device_printf(dev, "reset failed\n"); @@ -122,7 +118,7 @@ smcphy_attach(device_t dev) sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask; device_printf(dev, " "); - mii_add_media(sc); + mii_phy_add_media(sc); printf("\n"); MIIBUS_MEDIAINIT(sc->mii_dev); |