1 files changed, 10 insertions, 27 deletions

diff --git a/sys/dev/mii/pnaphy.c b/sys/dev/mii/pnaphy.c
index 159575b..0e77c4f 100644
--- a/sys/dev/mii/pnaphy.c
+++ b/sys/dev/mii/pnaphy.c
@@ -85,10 +85,16 @@ DRIVER_MODULE(pnaphy, miibus, pnaphy_driver, pnaphy_devclass, 0, 0);
 static int	pnaphy_service(struct mii_softc *, struct mii_data *,int);
 
 static const struct mii_phydesc pnaphys[] = {
-	MII_PHY_DESC(AMD, 79c978),
+	MII_PHY_DESC(yyAMD, 79c901home),
 	MII_PHY_END
 };
 
+static const struct mii_phy_funcs pnaphy_funcs = {
+	pnaphy_service,
+	ukphy_status,
+	mii_phy_reset
+};
+
 static int
 pnaphy_probe(device_t dev)
 {
@@ -99,32 +105,9 @@ pnaphy_probe(device_t dev)
 static int
 pnaphy_attach(device_t dev)
 {
-	struct mii_softc *sc;
-	struct mii_attach_args *ma;
-	struct mii_data *mii;
-
-	sc = device_get_softc(dev);
-	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->mii_flags = miibus_get_flags(dev);
-	sc->mii_inst = mii->mii_instance++;
-	sc->mii_phy = ma->mii_phyno;
-	sc->mii_service = pnaphy_service;
-	sc->mii_pdata = mii;
-
-	sc->mii_flags |= MIIF_NOISOLATE | MIIF_NOLOOP | MIIF_IS_HPNA;
-
-	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_IS_HPNA |
+	   MIIF_NOMANPAUSE, &pnaphy_funcs, 1);
 	return (0);
 }
 
@@ -160,7 +143,7 @@ pnaphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
 	}
 
 	/* Update the media status. */
-	ukphy_status(sc);
+	PHY_STATUS(sc);
 	if (IFM_SUBTYPE(mii->mii_media_active) == IFM_10_T)
 		mii->mii_media_active = IFM_ETHER | IFM_HPNA_1;