diff options
| author | Nathan Binkert <nate@cvs.openbsd.org> | 2001-07-17 01:15:23 +0000 |
|---|---|---|
| committer | Nathan Binkert <nate@cvs.openbsd.org> | 2001-07-17 01:15:23 +0000 |
| commit | 4ed0d1779fdd9e04c76c9734cca45389163346dd (patch) | |
| tree | f4f4a5fe3be8cef361bd8368c42689e24e9f4e14 /sys | |
| parent | d3687a53befdf9c10e1d07906d81776ac0ea69c4 (diff) | |
Rework exphymatch so that it uses positive logic. Makes more sense.
tested by jason@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/mii/exphy.c | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/sys/dev/mii/exphy.c b/sys/dev/mii/exphy.c index 4940de441d6..a1582b56d0f 100644 --- a/sys/dev/mii/exphy.c +++ b/sys/dev/mii/exphy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exphy.c,v 1.9 2001/07/16 16:34:07 peter Exp $ */ +/* $OpenBSD: exphy.c,v 1.10 2001/07/17 01:15:22 nate Exp $ */ /* $NetBSD: exphy.c,v 1.23 2000/02/02 23:34:56 thorpej Exp $ */ /*- @@ -108,24 +108,23 @@ exphymatch(parent, match, aux) { struct mii_attach_args *ma = aux; - /* - * Argh, 3Com PHY reports oui == 0 model == 0! - */ - if ((MII_OUI(ma->mii_id1, ma->mii_id2) != 0 || - MII_MODEL(ma->mii_id2) != 0) && - (MII_OUI(ma->mii_id1, ma->mii_id2) != MII_OUI_3COM || - MII_MODEL(ma->mii_id2) != 0) && - (MII_OUI(ma->mii_id1, ma->mii_id2) != MII_OUI_BROADCOM || - MII_MODEL(ma->mii_id2) != MII_MODEL_BROADCOM_3C905C)) - return (0); + if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_BROADCOM && + MII_MODEL(ma->mii_id2) == MII_MODEL_BROADCOM_3C905C) + return (10); /* - * Make sure the parent is an `xl'. + * Since 3com's PHY for some xl adapters is braindead and doesn't + * report the proper OUI/MODEL information, we have this stupid + * match function. */ - if (strcmp(parent->dv_cfdata->cf_driver->cd_name, "xl") != 0) - return (0); + if ((strcmp(parent->dv_cfdata->cf_driver->cd_name, "xl") == 0) && + ((MII_OUI(ma->mii_id1, ma->mii_id2) == 0 && + MII_MODEL(ma->mii_id2) == 0) || + (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_3COM && + MII_MODEL(ma->mii_id2) == 0))) + return (10); - return (10); + return (0); } void |