From b9b7fbb25dccf66f7e085debd1b2960eb761070d Mon Sep 17 00:00:00 2001 From: ambrisko Date: Fri, 16 Aug 2002 23:19:16 +0000 Subject: [PATCH] Revert change to detect multiply PHYs in mii code. There might be cases when this is needed. Work around bogus second PHY in the DFE-580 card via a change in the if_ste.c driver. Suggested by: jdp Reviewed by: jdp MFC after: 3 days --- sys/dev/mii/mii.c | 7 ++----- sys/pci/if_ste.c | 5 +++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/dev/mii/mii.c b/sys/dev/mii/mii.c index aad35736ec7f..9a63276566bf 100644 --- a/sys/dev/mii/mii.c +++ b/sys/dev/mii/mii.c @@ -110,17 +110,14 @@ int miibus_probe(dev) { struct mii_attach_args ma, *args; struct mii_data *mii; - device_t child = NULL, parent, *children; - int bmsr, capmask = 0xFFFFFFFF, nchildren; + device_t child = NULL, parent; + int bmsr, capmask = 0xFFFFFFFF; mii = device_get_softc(dev); parent = device_get_parent(dev); LIST_INIT(&mii->mii_phys); for (ma.mii_phyno = 0; ma.mii_phyno < MII_NPHY; ma.mii_phyno++) { - device_get_children(dev, &children, &nchildren); - if (nchildren) - break; /* * Check to see if there is a PHY at this address. Note, * many braindead PHYs report 0/0 in their ID registers, diff --git a/sys/pci/if_ste.c b/sys/pci/if_ste.c index 73f218c935fa..5a2a8142c5cd 100644 --- a/sys/pci/if_ste.c +++ b/sys/pci/if_ste.c @@ -380,6 +380,11 @@ static int ste_miibus_readreg(dev, phy, reg) sc = device_get_softc(dev); + if (pci_get_vendor(dev) == DL_VENDORID && + pci_get_device(dev) == DL_DEVICEID_550TX && + phy != 0) + return (0); + bzero((char *)&frame, sizeof(frame)); frame.mii_phyaddr = phy;