summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorthorpej <thorpej@NetBSD.org>2000-02-02 08:05:26 +0000
committerthorpej <thorpej@NetBSD.org>2000-02-02 08:05:26 +0000
commit84dc99fdeae6c85c10ea9ef1a486367cff85fbcf (patch)
tree67f4b7795dd44b7da8721a94cb82e3365a7b2f13 /sys
parentea45df4d301c0dc0d6a17003390f9efad4f05d65 (diff)
Bring some order to the chaos which was the MII code function naming
"conventions".
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/macppc/dev/if_bm.c4
-rw-r--r--sys/dev/ic/elink3.c4
-rw-r--r--sys/dev/ic/elinkxl.c4
-rw-r--r--sys/dev/ic/hme.c4
-rw-r--r--sys/dev/ic/i82557.c4
-rw-r--r--sys/dev/ic/smc83c170.c4
-rw-r--r--sys/dev/ic/tulip.c18
-rw-r--r--sys/dev/mii/dmphy.c8
-rw-r--r--sys/dev/mii/exphy.c8
-rw-r--r--sys/dev/mii/icsphy.c8
-rw-r--r--sys/dev/mii/inphy.c8
-rw-r--r--sys/dev/mii/iophy.c8
-rw-r--r--sys/dev/mii/lxtphy.c8
-rw-r--r--sys/dev/mii/mii.c18
-rw-r--r--sys/dev/mii/mii.h3
-rw-r--r--sys/dev/mii/mii_physubr.c12
-rw-r--r--sys/dev/mii/miivar.h27
-rw-r--r--sys/dev/mii/nsphy.c8
-rw-r--r--sys/dev/mii/nsphyter.c7
-rw-r--r--sys/dev/mii/qsphy.c8
-rw-r--r--sys/dev/mii/sqphy.c8
-rw-r--r--sys/dev/mii/tlphy.c8
-rw-r--r--sys/dev/mii/tqphy.c8
-rw-r--r--sys/dev/mii/ukphy.c8
-rw-r--r--sys/dev/pci/if_rl.c4
-rw-r--r--sys/dev/pci/if_sip.c4
-rw-r--r--sys/dev/pci/if_tl.c4
-rw-r--r--sys/dev/pci/if_vr.c4
-rw-r--r--sys/dev/pcmcia/if_xe.c4
-rw-r--r--sys/dev/sbus/be.c4
-rw-r--r--sys/dev/usb/if_aue.c4
31 files changed, 117 insertions, 116 deletions
diff --git a/sys/arch/macppc/dev/if_bm.c b/sys/arch/macppc/dev/if_bm.c
index 761be4bf725..9f76282a568 100644
--- a/sys/arch/macppc/dev/if_bm.c
+++ b/sys/arch/macppc/dev/if_bm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bm.c,v 1.4 2000/01/25 14:38:50 tsubai Exp $ */
+/* $NetBSD: if_bm.c,v 1.5 2000/02/02 08:05:31 thorpej Exp $ */
/*-
* Copyright (C) 1998, 1999, 2000 Tsubai Masanari. All rights reserved.
@@ -251,7 +251,7 @@ bmac_attach(parent, self, aux)
mii->mii_statchg = bmac_mii_statchg;
ifmedia_init(&mii->mii_media, 0, bmac_mediachange, bmac_mediastatus);
- mii_phy_probe(&sc->sc_dev, mii, 0xffffffff, MII_PHY_ANY,
+ mii_attach(&sc->sc_dev, mii, 0xffffffff, MII_PHY_ANY,
MII_OFFSET_ANY);
/* Choose a default media. */
diff --git a/sys/dev/ic/elink3.c b/sys/dev/ic/elink3.c
index 1baab2bb4f7..8354a6a1505 100644
--- a/sys/dev/ic/elink3.c
+++ b/sys/dev/ic/elink3.c
@@ -1,4 +1,4 @@
-/* $NetBSD: elink3.c,v 1.68 2000/02/02 08:00:21 augustss Exp $ */
+/* $NetBSD: elink3.c,v 1.69 2000/02/02 08:05:26 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -482,7 +482,7 @@ epconfig(sc, chipset, enaddr)
* we don't, just treat the Boomerang like the Vortex.
*/
if (sc->ep_flags & ELINK_FLAGS_MII) {
- mii_phy_probe(&sc->sc_dev, &sc->sc_mii, 0xffffffff,
+ mii_attach(&sc->sc_dev, &sc->sc_mii, 0xffffffff,
MII_PHY_ANY, MII_OFFSET_ANY);
if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) {
ifmedia_add(&sc->sc_mii.mii_media,
diff --git a/sys/dev/ic/elinkxl.c b/sys/dev/ic/elinkxl.c
index fab029b005d..74a03b135d7 100644
--- a/sys/dev/ic/elinkxl.c
+++ b/sys/dev/ic/elinkxl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: elinkxl.c,v 1.22 2000/01/18 03:35:40 mycroft Exp $ */
+/* $NetBSD: elinkxl.c,v 1.23 2000/02/02 08:05:26 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -409,7 +409,7 @@ ex_config(sc)
<< (CONFIG_XCVR_SEL_SHIFT + 16);
bus_space_write_4(iot, ioh, ELINK_W3_INTERNAL_CONFIG, icfg);
- mii_phy_probe(&sc->sc_dev, &sc->ex_mii, 0xffffffff,
+ mii_attach(&sc->sc_dev, &sc->ex_mii, 0xffffffff,
MII_PHY_ANY, MII_OFFSET_ANY);
if (LIST_FIRST(&sc->ex_mii.mii_phys) == NULL) {
ifmedia_add(&sc->ex_mii.mii_media, IFM_ETHER|IFM_NONE,
diff --git a/sys/dev/ic/hme.c b/sys/dev/ic/hme.c
index ec596719d89..cffb8297575 100644
--- a/sys/dev/ic/hme.c
+++ b/sys/dev/ic/hme.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hme.c,v 1.5 1999/12/18 14:05:37 pk Exp $ */
+/* $NetBSD: hme.c,v 1.6 2000/02/02 08:05:26 thorpej Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -246,7 +246,7 @@ hme_config(sc)
hme_mifinit(sc);
- mii_phy_probe(&sc->sc_dev, mii, 0xffffffff,
+ mii_attach(&sc->sc_dev, mii, 0xffffffff,
MII_PHY_ANY, MII_OFFSET_ANY);
child = LIST_FIRST(&mii->mii_phys);
diff --git a/sys/dev/ic/i82557.c b/sys/dev/ic/i82557.c
index 6f10c3ea174..ba9fd6ac946 100644
--- a/sys/dev/ic/i82557.c
+++ b/sys/dev/ic/i82557.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i82557.c,v 1.15 1999/12/12 17:46:36 thorpej Exp $ */
+/* $NetBSD: i82557.c,v 1.16 2000/02/02 08:05:27 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -401,7 +401,7 @@ fxp_mii_initmedia(sc)
sc->sc_mii.mii_statchg = fxp_statchg;
ifmedia_init(&sc->sc_mii.mii_media, 0, fxp_mii_mediachange,
fxp_mii_mediastatus);
- mii_phy_probe(&sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY,
+ mii_attach(&sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY,
MII_OFFSET_ANY);
if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) {
ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE, 0, NULL);
diff --git a/sys/dev/ic/smc83c170.c b/sys/dev/ic/smc83c170.c
index 88a77466135..4c1d580c753 100644
--- a/sys/dev/ic/smc83c170.c
+++ b/sys/dev/ic/smc83c170.c
@@ -1,4 +1,4 @@
-/* $NetBSD: smc83c170.c,v 1.23 1999/11/12 18:14:18 thorpej Exp $ */
+/* $NetBSD: smc83c170.c,v 1.24 2000/02/02 08:05:27 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -229,7 +229,7 @@ epic_attach(sc)
sc->sc_mii.mii_statchg = epic_statchg;
ifmedia_init(&sc->sc_mii.mii_media, 0, epic_mediachange,
epic_mediastatus);
- mii_phy_probe(&sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY,
+ mii_attach(&sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY,
MII_OFFSET_ANY);
if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) {
ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE, 0, NULL);
diff --git a/sys/dev/ic/tulip.c b/sys/dev/ic/tulip.c
index 6437dd1181d..d14d4e57f8b 100644
--- a/sys/dev/ic/tulip.c
+++ b/sys/dev/ic/tulip.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tulip.c,v 1.42 2000/02/01 22:54:47 thorpej Exp $ */
+/* $NetBSD: tulip.c,v 1.43 2000/02/02 08:05:27 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -531,7 +531,7 @@ tlp_activate(self, act)
case DVACT_DEACTIVATE:
if (sc->sc_flags & TULIPF_HAS_MII)
- mii_phy_activate(&sc->sc_mii, act, MII_PHY_ANY,
+ mii_activate(&sc->sc_mii, act, MII_PHY_ANY,
MII_OFFSET_ANY);
if_deactivate(&sc->sc_ethercom.ec_if);
break;
@@ -561,7 +561,7 @@ tlp_detach(sc)
if (sc->sc_flags & TULIPF_HAS_MII) {
/* Detach all PHYs */
- mii_phy_detach(&sc->sc_mii, MII_PHY_ANY, MII_OFFSET_ANY);
+ mii_detach(&sc->sc_mii, MII_PHY_ANY, MII_OFFSET_ANY);
}
/* Delete all remaining media. */
@@ -4310,7 +4310,7 @@ tlp_2114x_isv_tmsw_init(sc)
* particularly care; the MII code just likes to
* search the whole thing anyhow.
*/
- mii_phy_probe(&sc->sc_dev, &sc->sc_mii, 0xffffffff,
+ mii_attach(&sc->sc_dev, &sc->sc_mii, 0xffffffff,
MII_PHY_ANY, tm->tm_phyno);
/*
@@ -4470,7 +4470,7 @@ tlp_2114x_isv_tmsw_init(sc)
* particularly care; the MII code just likes to
* search the whole thing anyhow.
*/
- mii_phy_probe(&sc->sc_dev, &sc->sc_mii, 0xffffffff,
+ mii_attach(&sc->sc_dev, &sc->sc_mii, 0xffffffff,
MII_PHY_ANY, tm->tm_phyno);
/*
@@ -4687,7 +4687,7 @@ tlp_sio_mii_tmsw_init(sc)
sc->sc_mii.mii_statchg = sc->sc_statchg;
ifmedia_init(&sc->sc_mii.mii_media, 0, tlp_mediachange,
tlp_mediastatus);
- mii_phy_probe(&sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY,
+ mii_attach(&sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY,
MII_OFFSET_ANY);
if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) {
ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE, 0, NULL);
@@ -4735,7 +4735,7 @@ tlp_pnic_tmsw_init(sc)
sc->sc_mii.mii_statchg = sc->sc_statchg;
ifmedia_init(&sc->sc_mii.mii_media, 0, tlp_mediachange,
tlp_mediastatus);
- mii_phy_probe(&sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY,
+ mii_attach(&sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY,
MII_OFFSET_ANY);
if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) {
/* XXX What about AUI/BNC support? */
@@ -5147,7 +5147,7 @@ tlp_pmac_tmsw_init(sc)
tlp_mediastatus);
if (sc->sc_chip == TULIP_CHIP_MX98713 ||
sc->sc_chip == TULIP_CHIP_MX98713A) {
- mii_phy_probe(&sc->sc_dev, &sc->sc_mii, 0xffffffff,
+ mii_attach(&sc->sc_dev, &sc->sc_mii, 0xffffffff,
MII_PHY_ANY, MII_OFFSET_ANY);
if (LIST_FIRST(&sc->sc_mii.mii_phys) != NULL) {
sc->sc_flags |= TULIPF_HAS_MII;
@@ -5215,7 +5215,7 @@ tlp_al981_tmsw_init(sc)
sc->sc_mii.mii_statchg = sc->sc_statchg;
ifmedia_init(&sc->sc_mii.mii_media, 0, tlp_mediachange,
tlp_mediastatus);
- mii_phy_probe(&sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY,
+ mii_attach(&sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY,
MII_OFFSET_ANY);
if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) {
ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE, 0, NULL);
diff --git a/sys/dev/mii/dmphy.c b/sys/dev/mii/dmphy.c
index a8009ae702d..a02258e9b67 100644
--- a/sys/dev/mii/dmphy.c
+++ b/sys/dev/mii/dmphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dmphy.c,v 1.1 2000/02/02 04:29:49 thorpej Exp $ */
+/* $NetBSD: dmphy.c,v 1.2 2000/02/02 08:05:32 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -92,8 +92,8 @@ int dmphymatch __P((struct device *, struct cfdata *, void *));
void dmphyattach __P((struct device *, struct device *, void *));
struct cfattach dmphy_ca = {
- sizeof(struct mii_softc), dmphymatch, dmphyattach, mii_detach,
- mii_activate
+ sizeof(struct mii_softc), dmphymatch, dmphyattach, mii_phy_detach,
+ mii_phy_activate
};
int dmphy_service __P((struct mii_softc *, struct mii_data *, int));
@@ -139,7 +139,7 @@ dmphyattach(parent, self, aux)
if ((sc->mii_capabilities & BMSR_MEDIAMASK) == 0)
printf("no media present");
else
- mii_add_media(sc);
+ mii_phy_add_media(sc);
printf("\n");
}
diff --git a/sys/dev/mii/exphy.c b/sys/dev/mii/exphy.c
index 1bff77cf0b5..164f0a5c2b5 100644
--- a/sys/dev/mii/exphy.c
+++ b/sys/dev/mii/exphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: exphy.c,v 1.19 2000/01/27 16:44:30 thorpej Exp $ */
+/* $NetBSD: exphy.c,v 1.20 2000/02/02 08:05:32 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -88,8 +88,8 @@ int exphymatch __P((struct device *, struct cfdata *, void *));
void exphyattach __P((struct device *, struct device *, void *));
struct cfattach exphy_ca = {
- sizeof(struct mii_softc), exphymatch, exphyattach, mii_detach,
- mii_activate
+ sizeof(struct mii_softc), exphymatch, exphyattach, mii_phy_detach,
+ mii_phy_activate
};
int exphy_service __P((struct mii_softc *, struct mii_data *, int));
@@ -154,7 +154,7 @@ exphyattach(parent, self, aux)
if ((sc->mii_capabilities & BMSR_MEDIAMASK) == 0)
printf("no media present");
else
- mii_add_media(sc);
+ mii_phy_add_media(sc);
printf("\n");
}
diff --git a/sys/dev/mii/icsphy.c b/sys/dev/mii/icsphy.c
index 41f78045852..410e274cb3f 100644
--- a/sys/dev/mii/icsphy.c
+++ b/sys/dev/mii/icsphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: icsphy.c,v 1.13 2000/01/27 16:44:30 thorpej Exp $ */
+/* $NetBSD: icsphy.c,v 1.14 2000/02/02 08:05:32 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -91,8 +91,8 @@ int icsphymatch __P((struct device *, struct cfdata *, void *));
void icsphyattach __P((struct device *, struct device *, void *));
struct cfattach icsphy_ca = {
- sizeof(struct mii_softc), icsphymatch, icsphyattach, mii_detach,
- mii_activate
+ sizeof(struct mii_softc), icsphymatch, icsphyattach, mii_phy_detach,
+ mii_phy_activate
};
int icsphy_service __P((struct mii_softc *, struct mii_data *, int));
@@ -139,7 +139,7 @@ icsphyattach(parent, self, aux)
if ((sc->mii_capabilities & BMSR_MEDIAMASK) == 0)
printf("no media present");
else
- mii_add_media(sc);
+ mii_phy_add_media(sc);
printf("\n");
}
diff --git a/sys/dev/mii/inphy.c b/sys/dev/mii/inphy.c
index f66b6b55ae5..714d33c509f 100644
--- a/sys/dev/mii/inphy.c
+++ b/sys/dev/mii/inphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: inphy.c,v 1.14 2000/01/27 16:44:30 thorpej Exp $ */
+/* $NetBSD: inphy.c,v 1.15 2000/02/02 08:05:32 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -92,8 +92,8 @@ int inphymatch __P((struct device *, struct cfdata *, void *));
void inphyattach __P((struct device *, struct device *, void *));
struct cfattach inphy_ca = {
- sizeof(struct mii_softc), inphymatch, inphyattach, mii_detach,
- mii_activate
+ sizeof(struct mii_softc), inphymatch, inphyattach, mii_phy_detach,
+ mii_phy_activate
};
int inphy_service __P((struct mii_softc *, struct mii_data *, int));
@@ -146,7 +146,7 @@ inphyattach(parent, self, aux)
if ((sc->mii_capabilities & BMSR_MEDIAMASK) == 0)
printf("no media present");
else
- mii_add_media(sc);
+ mii_phy_add_media(sc);
printf("\n");
}
diff --git a/sys/dev/mii/iophy.c b/sys/dev/mii/iophy.c
index c266a84f842..5cee8cf206f 100644
--- a/sys/dev/mii/iophy.c
+++ b/sys/dev/mii/iophy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iophy.c,v 1.4 2000/01/27 16:44:30 thorpej Exp $ */
+/* $NetBSD: iophy.c,v 1.5 2000/02/02 08:05:32 thorpej Exp $ */
/*
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -90,8 +90,8 @@ int iophymatch __P((struct device *, struct cfdata *, void *));
void iophyattach __P((struct device *, struct device *, void *));
struct cfattach iophy_ca = {
- sizeof(struct mii_softc), iophymatch, iophyattach, mii_detach,
- mii_activate
+ sizeof(struct mii_softc), iophymatch, iophyattach, mii_phy_detach,
+ mii_phy_activate
};
int iophy_service __P((struct mii_softc *, struct mii_data *, int));
@@ -148,7 +148,7 @@ iophyattach(parent, self, aux)
if ((sc->mii_capabilities & BMSR_MEDIAMASK) == 0)
printf("no media present");
else
- mii_add_media(sc);
+ mii_phy_add_media(sc);
printf("\n");
}
diff --git a/sys/dev/mii/lxtphy.c b/sys/dev/mii/lxtphy.c
index b58b32e48cc..b5e454453c3 100644
--- a/sys/dev/mii/lxtphy.c
+++ b/sys/dev/mii/lxtphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lxtphy.c,v 1.15 2000/01/27 16:44:30 thorpej Exp $ */
+/* $NetBSD: lxtphy.c,v 1.16 2000/02/02 08:05:33 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -92,8 +92,8 @@ int lxtphymatch __P((struct device *, struct cfdata *, void *));
void lxtphyattach __P((struct device *, struct device *, void *));
struct cfattach lxtphy_ca = {
- sizeof(struct mii_softc), lxtphymatch, lxtphyattach, mii_detach,
- mii_activate
+ sizeof(struct mii_softc), lxtphymatch, lxtphyattach, mii_phy_detach,
+ mii_phy_activate
};
int lxtphy_service __P((struct mii_softc *, struct mii_data *, int));
@@ -139,7 +139,7 @@ lxtphyattach(parent, self, aux)
if ((sc->mii_capabilities & BMSR_MEDIAMASK) == 0)
printf("no media present");
else
- mii_add_media(sc);
+ mii_phy_add_media(sc);
printf("\n");
}
diff --git a/sys/dev/mii/mii.c b/sys/dev/mii/mii.c
index 8168d877c5a..769660f4c93 100644
--- a/sys/dev/mii/mii.c
+++ b/sys/dev/mii/mii.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mii.c,v 1.17 2000/01/27 16:44:30 thorpej Exp $ */
+/* $NetBSD: mii.c,v 1.18 2000/02/02 08:05:33 thorpej Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@ int mii_submatch __P((struct device *, struct cfdata *, void *));
* to the network interface driver parent.
*/
void
-mii_phy_probe(parent, mii, capmask, phyloc, offloc)
+mii_attach(parent, mii, capmask, phyloc, offloc)
struct device *parent;
struct mii_data *mii;
int capmask, phyloc, offloc;
@@ -73,7 +73,7 @@ mii_phy_probe(parent, mii, capmask, phyloc, offloc)
int phymin, phymax;
if (phyloc != MII_PHY_ANY && offloc != MII_PHY_ANY)
- panic("mii_phy_probe: phyloc and offloc specified");
+ panic("mii_attach: phyloc and offloc specified");
if (phyloc == MII_PHY_ANY) {
phymin = 0;
@@ -89,7 +89,7 @@ mii_phy_probe(parent, mii, capmask, phyloc, offloc)
for (ma.mii_phyno = phymin; ma.mii_phyno <= phymax; ma.mii_phyno++) {
/*
* Make sure we haven't already configured a PHY at this
- * address. This allows mii_phy_probe() to be called
+ * address. This allows mii_attach() to be called
* multiple times.
*/
for (child = LIST_FIRST(&mii->mii_phys); child != NULL;
@@ -152,7 +152,7 @@ mii_phy_probe(parent, mii, capmask, phyloc, offloc)
}
void
-mii_phy_activate(mii, act, phyloc, offloc)
+mii_activate(mii, act, phyloc, offloc)
struct mii_data *mii;
enum devact act;
int phyloc, offloc;
@@ -160,7 +160,7 @@ mii_phy_activate(mii, act, phyloc, offloc)
struct mii_softc *child;
if (phyloc != MII_PHY_ANY && offloc != MII_PHY_ANY)
- panic("mii_phy_detach: phyloc and offloc specified");
+ panic("mii_activate: phyloc and offloc specified");
if ((mii->mii_flags & MIIF_INITDONE) == 0)
return;
@@ -177,7 +177,7 @@ mii_phy_activate(mii, act, phyloc, offloc)
}
switch (act) {
case DVACT_ACTIVATE:
- panic("mii_phy_activate: DVACT_ACTIVATE");
+ panic("mii_activate: DVACT_ACTIVATE");
break;
case DVACT_DEACTIVATE:
@@ -189,14 +189,14 @@ mii_phy_activate(mii, act, phyloc, offloc)
}
void
-mii_phy_detach(mii, phyloc, offloc)
+mii_detach(mii, phyloc, offloc)
struct mii_data *mii;
int phyloc, offloc;
{
struct mii_softc *child, *nchild;
if (phyloc != MII_PHY_ANY && offloc != MII_PHY_ANY)
- panic("mii_phy_detach: phyloc and offloc specified");
+ panic("mii_detach: phyloc and offloc specified");
if ((mii->mii_flags & MIIF_INITDONE) == 0)
return;
diff --git a/sys/dev/mii/mii.h b/sys/dev/mii/mii.h
index c3891b67986..2c844ed42ae 100644
--- a/sys/dev/mii/mii.h
+++ b/sys/dev/mii/mii.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mii.h,v 1.2 1999/09/29 22:49:33 thorpej Exp $ */
+/* $NetBSD: mii.h,v 1.3 2000/02/02 08:05:33 thorpej Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
@@ -67,6 +67,7 @@
#define BMSR_100TXHDX 0x2000 /* 100 base Tx half duplex capable */
#define BMSR_10TFDX 0x1000 /* 10 base T full duplex capable */
#define BMSR_10THDX 0x0800 /* 10 base T half duplex capable */
+#define BMSR_MFPS 0x0040 /* MII Frame Preamble Suppression */
#define BMSR_ACOMP 0x0020 /* Autonegotiation complete */
#define BMSR_RFAULT 0x0010 /* Link partner fault */
#define BMSR_ANEG 0x0008 /* Autonegotiation capable */
diff --git a/sys/dev/mii/mii_physubr.c b/sys/dev/mii/mii_physubr.c
index e9d52c9d4dc..4082f71d7f7 100644
--- a/sys/dev/mii/mii_physubr.c
+++ b/sys/dev/mii/mii_physubr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mii_physubr.c,v 1.9 2000/01/27 16:44:30 thorpej Exp $ */
+/* $NetBSD: mii_physubr.c,v 1.10 2000/02/02 08:05:33 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -196,7 +196,7 @@ mii_phy_down(sc)
* of media names. Does not print a newline.
*/
void
-mii_add_media(sc)
+mii_phy_add_media(sc)
struct mii_softc *sc;
{
struct mii_data *mii = sc->mii_pdata;
@@ -259,7 +259,7 @@ mii_add_media(sc)
}
void
-mii_delete_media(sc)
+mii_phy_delete_media(sc)
struct mii_softc *sc;
{
struct mii_data *mii = sc->mii_pdata;
@@ -268,7 +268,7 @@ mii_delete_media(sc)
}
int
-mii_activate(self, act)
+mii_phy_activate(self, act)
struct device *self;
enum devact act;
{
@@ -288,7 +288,7 @@ mii_activate(self, act)
}
int
-mii_detach(self, flags)
+mii_phy_detach(self, flags)
struct device *self;
int flags;
{
@@ -297,7 +297,7 @@ mii_detach(self, flags)
if (sc->mii_flags & MIIF_DOINGAUTO)
untimeout(mii_phy_auto_timeout, sc);
- mii_delete_media(sc);
+ mii_phy_delete_media(sc);
return (0);
}
diff --git a/sys/dev/mii/miivar.h b/sys/dev/mii/miivar.h
index 32a28accc53..5702966b4b6 100644
--- a/sys/dev/mii/miivar.h
+++ b/sys/dev/mii/miivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: miivar.h,v 1.13 2000/01/27 16:44:30 thorpej Exp $ */
+/* $NetBSD: miivar.h,v 1.14 2000/02/02 08:05:33 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -44,9 +44,6 @@
/*
* Media Independent Interface autoconfiguration defintions.
- *
- * This file exports an interface which attempts to be compatible
- * with the BSD/OS 3.0 interface.
*/
struct mii_softc;
@@ -139,9 +136,9 @@ typedef struct mii_softc mii_softc_t;
#define MIIF_INHERIT_MASK (MIIF_NOISOLATE|MIIF_NOLOOP)
/*
- * Special `locators' passed to mii_phy_probe. If one of these is not
+ * Special `locators' passed to mii_attach(). If one of these is not
* an `any' value, we look for *that* PHY and configure it. If both
- * are not `any', that is an error, and mii_phy_probe() will panic.
+ * are not `any', that is an error, and mii_attach() will panic.
*/
#define MII_OFFSET_ANY -1
#define MII_PHY_ANY -1
@@ -185,24 +182,26 @@ struct mii_media {
(*(p)->mii_pdata->mii_writereg)((p)->mii_dev.dv_parent, \
(p)->mii_phy, (r), (v))
+void mii_attach __P((struct device *, struct mii_data *, int, int, int));
+void mii_activate __P((struct mii_data *, enum devact, int, int));
+void mii_detach __P((struct mii_data *, int, int));
+
int mii_mediachg __P((struct mii_data *));
void mii_tick __P((struct mii_data *));
void mii_pollstat __P((struct mii_data *));
void mii_down __P((struct mii_data *));
-void mii_phy_probe __P((struct device *, struct mii_data *, int, int, int));
-void mii_phy_activate __P((struct mii_data *, enum devact, int, int));
-void mii_phy_detach __P((struct mii_data *, int, int));
-void mii_add_media __P((struct mii_softc *));
-void mii_delete_media __P((struct mii_softc *));
+
+int mii_phy_activate __P((struct device *, enum devact));
+int mii_phy_detach __P((struct device *, int));
+
+void mii_phy_add_media __P((struct mii_softc *));
+void mii_phy_delete_media __P((struct mii_softc *));
void mii_phy_setmedia __P((struct mii_softc *));
int mii_phy_auto __P((struct mii_softc *, int));
void mii_phy_reset __P((struct mii_softc *));
void mii_phy_down __P((struct mii_softc *));
-int mii_activate __P((struct device *, enum devact));
-int mii_detach __P((struct device *, int));
-
void ukphy_status __P((struct mii_softc *));
#endif /* _KERNEL */
diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c
index 8a4b28b1c80..dea134ed73c 100644
--- a/sys/dev/mii/nsphy.c
+++ b/sys/dev/mii/nsphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nsphy.c,v 1.21 2000/01/27 16:44:30 thorpej Exp $ */
+/* $NetBSD: nsphy.c,v 1.22 2000/02/02 08:05:33 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -92,8 +92,8 @@ int nsphymatch __P((struct device *, struct cfdata *, void *));
void nsphyattach __P((struct device *, struct device *, void *));
struct cfattach nsphy_ca = {
- sizeof(struct mii_softc), nsphymatch, nsphyattach, mii_detach,
- mii_activate
+ sizeof(struct mii_softc), nsphymatch, nsphyattach, mii_phy_detach,
+ mii_phy_activate
};
int nsphy_service __P((struct mii_softc *, struct mii_data *, int));
@@ -146,7 +146,7 @@ nsphyattach(parent, self, aux)
if ((sc->mii_capabilities & BMSR_MEDIAMASK) == 0)
printf("no media present");
else
- mii_add_media(sc);
+ mii_phy_add_media(sc);
printf("\n");
}
diff --git a/sys/dev/mii/nsphyter.c b/sys/dev/mii/nsphyter.c
index bfb8899cddf..61269e6f6e3 100644
--- a/sys/dev/mii/nsphyter.c
+++ b/sys/dev/mii/nsphyter.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nsphyter.c,v 1.1 1999/12/07 19:36:37 thorpej Exp $ */
+/* $NetBSD: nsphyter.c,v 1.2 2000/02/02 08:05:33 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -92,7 +92,8 @@ int nsphytermatch __P((struct device *, struct cfdata *, void *));
void nsphyterattach __P((struct device *, struct device *, void *));
struct cfattach nsphyter_ca = {
- sizeof(struct mii_softc), nsphytermatch, nsphyterattach
+ sizeof(struct mii_softc), nsphytermatch, nsphyterattach,
+ mii_phy_detach, mii_phy_activate
};
int nsphyter_service __P((struct mii_softc *, struct mii_data *, int));
@@ -138,7 +139,7 @@ nsphyterattach(parent, self, aux)
if ((sc->mii_capabilities & BMSR_MEDIAMASK) == 0)
printf("no media present");
else
- mii_add_media(sc);
+ mii_phy_add_media(sc);
printf("\n");
}
diff --git a/sys/dev/mii/qsphy.c b/sys/dev/mii/qsphy.c
index bd87bb1f81c..add164b0444 100644
--- a/sys/dev/mii/qsphy.c
+++ b/sys/dev/mii/qsphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: qsphy.c,v 1.15 2000/01/27 16:44:30 thorpej Exp $ */
+/* $NetBSD: qsphy.c,v 1.16 2000/02/02 08:05:33 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -91,8 +91,8 @@ int qsphymatch __P((struct device *, struct cfdata *, void *));
void qsphyattach __P((struct device *, struct device *, void *));
struct cfattach qsphy_ca = {
- sizeof(struct mii_softc), qsphymatch, qsphyattach, mii_detach,
- mii_activate
+ sizeof(struct mii_softc), qsphymatch, qsphyattach, mii_phy_detach,
+ mii_phy_activate
};
int qsphy_service __P((struct mii_softc *, struct mii_data *, int));
@@ -139,7 +139,7 @@ qsphyattach(parent, self, aux)
if ((sc->mii_capabilities & BMSR_MEDIAMASK) == 0)
printf("no media present");
else
- mii_add_media(sc);
+ mii_phy_add_media(sc);
printf("\n");
}
diff --git a/sys/dev/mii/sqphy.c b/sys/dev/mii/sqphy.c
index d3bccf13d9c..52e1c044674 100644
--- a/sys/dev/mii/sqphy.c
+++ b/sys/dev/mii/sqphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sqphy.c,v 1.13 2000/01/27 16:44:30 thorpej Exp $ */
+/* $NetBSD: sqphy.c,v 1.14 2000/02/02 08:05:34 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -92,8 +92,8 @@ int sqphymatch __P((struct device *, struct cfdata *, void *));
void sqphyattach __P((struct device *, struct device *, void *));
struct cfattach sqphy_ca = {
- sizeof(struct mii_softc), sqphymatch, sqphyattach, mii_detach,
- mii_activate
+ sizeof(struct mii_softc), sqphymatch, sqphyattach, mii_phy_detach,
+ mii_phy_activate
};
int sqphy_service __P((struct mii_softc *, struct mii_data *, int));
@@ -139,7 +139,7 @@ sqphyattach(parent, self, aux)
if ((sc->mii_capabilities & BMSR_MEDIAMASK) == 0)
printf("no media present");
else
- mii_add_media(sc);
+ mii_phy_add_media(sc);
printf("\n");
}
diff --git a/sys/dev/mii/tlphy.c b/sys/dev/mii/tlphy.c
index 43b7cbc5332..7ad88685f76 100644
--- a/sys/dev/mii/tlphy.c
+++ b/sys/dev/mii/tlphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tlphy.c,v 1.21 2000/01/27 16:44:30 thorpej Exp $ */
+/* $NetBSD: tlphy.c,v 1.22 2000/02/02 08:05:34 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -106,8 +106,8 @@ int tlphymatch __P((struct device *, struct cfdata *, void *));
void tlphyattach __P((struct device *, struct device *, void *));
struct cfattach tlphy_ca = {
- sizeof(struct tlphy_softc), tlphymatch, tlphyattach, mii_detach,
- mii_activate
+ sizeof(struct tlphy_softc), tlphymatch, tlphyattach, mii_phy_detach,
+ mii_phy_activate
};
int tlphy_service __P((struct mii_softc *, struct mii_data *, int));
@@ -183,7 +183,7 @@ tlphyattach(parent, self, aux)
}
if (sc->sc_mii.mii_capabilities & BMSR_MEDIAMASK) {
printf(sep);
- mii_add_media(&sc->sc_mii);
+ mii_phy_add_media(&sc->sc_mii);
} else if ((sc->sc_tlphycap &
(TLPHY_MEDIA_10_2 | TLPHY_MEDIA_10_5)) == 0)
printf("no media present");
diff --git a/sys/dev/mii/tqphy.c b/sys/dev/mii/tqphy.c
index d23161377d9..3b6d4a7655f 100644
--- a/sys/dev/mii/tqphy.c
+++ b/sys/dev/mii/tqphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tqphy.c,v 1.5 2000/01/27 16:44:30 thorpej Exp $ */
+/* $NetBSD: tqphy.c,v 1.6 2000/02/02 08:05:34 thorpej Exp $ */
/*
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -92,8 +92,8 @@ int tqphymatch __P((struct device *, struct cfdata *, void *));
void tqphyattach __P((struct device *, struct device *, void *));
struct cfattach tqphy_ca = {
- sizeof(struct mii_softc), tqphymatch, tqphyattach, mii_detach,
- mii_activate
+ sizeof(struct mii_softc), tqphymatch, tqphyattach, mii_phy_detach,
+ mii_phy_activate
};
int tqphy_service __P((struct mii_softc *, struct mii_data *, int));
@@ -147,7 +147,7 @@ tqphyattach(parent, self, aux)
if ((sc->mii_capabilities & BMSR_MEDIAMASK) == 0)
printf("no media present");
else
- mii_add_media(sc);
+ mii_phy_add_media(sc);
printf("\n");
}
diff --git a/sys/dev/mii/ukphy.c b/sys/dev/mii/ukphy.c
index 5fc21e3764c..5f9c7254766 100644
--- a/sys/dev/mii/ukphy.c
+++ b/sys/dev/mii/ukphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ukphy.c,v 1.5 2000/01/27 16:44:30 thorpej Exp $ */
+/* $NetBSD: ukphy.c,v 1.6 2000/02/02 08:05:34 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -88,8 +88,8 @@ int ukphymatch __P((struct device *, struct cfdata *, void *));
void ukphyattach __P((struct device *, struct device *, void *));
struct cfattach ukphy_ca = {
- sizeof(struct mii_softc), ukphymatch, ukphyattach, mii_detach,
- mii_activate
+ sizeof(struct mii_softc), ukphymatch, ukphyattach, mii_phy_detach,
+ mii_phy_activate
};
int ukphy_service __P((struct mii_softc *, struct mii_data *, int));
@@ -139,7 +139,7 @@ ukphyattach(parent, self, aux)
if ((sc->mii_capabilities & BMSR_MEDIAMASK) == 0)
printf("no media present");
else
- mii_add_media(sc);
+ mii_phy_add_media(sc);
printf("\n");
}
diff --git a/sys/dev/pci/if_rl.c b/sys/dev/pci/if_rl.c
index 5e646c7ab72..ca602c7ce13 100644
--- a/sys/dev/pci/if_rl.c
+++ b/sys/dev/pci/if_rl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rl.c,v 1.4 1999/11/12 18:14:19 thorpej Exp $ */
+/* $NetBSD: if_rl.c,v 1.5 2000/02/02 08:05:29 thorpej Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -930,7 +930,7 @@ rl_attach(parent, self, aux)
sc->mii.mii_writereg = rl_phy_writereg;
sc->mii.mii_statchg = rl_phy_statchg;
ifmedia_init(&sc->mii.mii_media, 0, rl_ifmedia_upd, rl_ifmedia_sts);
- mii_phy_probe(self, &sc->mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY);
+ mii_attach(self, &sc->mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY);
/* Choose a default media. */
if (LIST_FIRST(&sc->mii.mii_phys) == NULL) {
diff --git a/sys/dev/pci/if_sip.c b/sys/dev/pci/if_sip.c
index 36f9aef2407..e78d36ce4d3 100644
--- a/sys/dev/pci/if_sip.c
+++ b/sys/dev/pci/if_sip.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sip.c,v 1.5 2000/01/31 18:36:12 thorpej Exp $ */
+/* $NetBSD: if_sip.c,v 1.6 2000/02/02 08:05:29 thorpej Exp $ */
/*-
* Copyright (c) 1999 Network Computer, Inc.
@@ -512,7 +512,7 @@ sip_attach(parent, self, aux)
sc->sc_mii.mii_statchg = sip_mii_statchg;
ifmedia_init(&sc->sc_mii.mii_media, 0, sip_mediachange,
sip_mediastatus);
- mii_phy_probe(&sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY,
+ mii_attach(&sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY,
MII_OFFSET_ANY);
if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) {
ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE, 0, NULL);
diff --git a/sys/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c
index 1cc107a44a0..d7e9ef27deb 100644
--- a/sys/dev/pci/if_tl.c
+++ b/sys/dev/pci/if_tl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tl.c,v 1.28 1999/12/12 17:55:21 tron Exp $ */
+/* $NetBSD: if_tl.c,v 1.29 2000/02/02 08:05:29 thorpej Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
@@ -428,7 +428,7 @@ tl_pci_attach(parent, self, aux)
sc->tl_mii.mii_statchg = tl_statchg;
ifmedia_init(&sc->tl_mii.mii_media, IFM_IMASK, tl_mediachange,
tl_mediastatus);
- mii_phy_probe(self, &sc->tl_mii, 0xffffffff, MII_PHY_ANY,
+ mii_attach(self, &sc->tl_mii, 0xffffffff, MII_PHY_ANY,
MII_OFFSET_ANY);
if (LIST_FIRST(&sc->tl_mii.mii_phys) == NULL) {
ifmedia_add(&sc->tl_mii.mii_media, IFM_ETHER|IFM_NONE, 0, NULL);
diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c
index f632bb3e16a..58d13c3c602 100644
--- a/sys/dev/pci/if_vr.c
+++ b/sys/dev/pci/if_vr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vr.c,v 1.30 1999/12/12 02:56:49 thorpej Exp $ */
+/* $NetBSD: if_vr.c,v 1.31 2000/02/02 08:05:29 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -1710,7 +1710,7 @@ vr_attach(parent, self, aux)
sc->vr_mii.mii_writereg = vr_mii_writereg;
sc->vr_mii.mii_statchg = vr_mii_statchg;
ifmedia_init(&sc->vr_mii.mii_media, 0, vr_ifmedia_upd, vr_ifmedia_sts);
- mii_phy_probe(&sc->vr_dev, &sc->vr_mii, 0xffffffff, MII_PHY_ANY,
+ mii_attach(&sc->vr_dev, &sc->vr_mii, 0xffffffff, MII_PHY_ANY,
MII_OFFSET_ANY);
if (LIST_FIRST(&sc->vr_mii.mii_phys) == NULL) {
ifmedia_add(&sc->vr_mii.mii_media, IFM_ETHER|IFM_NONE, 0, NULL);
diff --git a/sys/dev/pcmcia/if_xe.c b/sys/dev/pcmcia/if_xe.c
index e14c8232b37..c9f72c84a81 100644
--- a/sys/dev/pcmcia/if_xe.c
+++ b/sys/dev/pcmcia/if_xe.c
@@ -1,5 +1,5 @@
/* $OpenBSD: if_xe.c,v 1.9 1999/09/16 11:28:42 niklas Exp $ */
-/* $NetBSD: if_xe.c,v 1.2 2000/01/09 17:21:38 joda Exp $ */
+/* $NetBSD: if_xe.c,v 1.3 2000/02/02 08:05:30 thorpej Exp $ */
/*
* Copyright (c) 1999 Niklas Hallqvist, C Stone, Job de Haas
@@ -444,7 +444,7 @@ xe_pcmcia_attach(parent, self, aux)
xe_mediastatus);
DPRINTF(XED_MII | XED_CONFIG,
("bmsr %x\n", xe_mdi_read(&sc->sc_dev, 0, 1)));
- mii_phy_probe(self, &sc->sc_mii, 0xffffffff
+ mii_attach(self, &sc->sc_mii, 0xffffffff
#ifdef __NetBSD__
,MII_PHY_ANY, MII_OFFSET_ANY
#endif
diff --git a/sys/dev/sbus/be.c b/sys/dev/sbus/be.c
index 790a8852029..23d127b3ed2 100644
--- a/sys/dev/sbus/be.c
+++ b/sys/dev/sbus/be.c
@@ -1,4 +1,4 @@
-/* $NetBSD: be.c,v 1.13 1999/12/23 16:39:56 pk Exp $ */
+/* $NetBSD: be.c,v 1.14 2000/02/02 08:05:30 thorpej Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -352,7 +352,7 @@ beattach(parent, self, aux)
if ((v & MGMT_PAL_EXT_MDIO) != 0) {
- mii_phy_probe(&sc->sc_dev, mii, 0xffffffff, BE_PHY_EXTERNAL,
+ mii_attach(&sc->sc_dev, mii, 0xffffffff, BE_PHY_EXTERNAL,
MII_OFFSET_ANY);
child = LIST_FIRST(&mii->mii_phys);
diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c
index b6ee39ff41f..b5730f48e5c 100644
--- a/sys/dev/usb/if_aue.c
+++ b/sys/dev/usb/if_aue.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_aue.c,v 1.16 2000/01/28 00:51:25 augustss Exp $ */
+/* $NetBSD: if_aue.c,v 1.17 2000/02/02 08:05:31 thorpej Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
@@ -849,7 +849,7 @@ USB_ATTACH(aue)
mii->mii_writereg = aue_miibus_writereg;
mii->mii_statchg = aue_miibus_statchg;
ifmedia_init(&mii->mii_media, 0, aue_ifmedia_upd, aue_ifmedia_sts);
- mii_phy_probe(self, mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY);
+ mii_attach(self, mii, 0xffffffff, MII_PHY_ANY, MII_OFFSET_ANY);
if (LIST_FIRST(&mii->mii_phys) == NULL) {
ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_NONE, 0, NULL);
ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_NONE);