diff options
| author | Nathan Binkert <nate@cvs.openbsd.org> | 2003-05-14 05:09:44 +0000 |
|---|---|---|
| committer | Nathan Binkert <nate@cvs.openbsd.org> | 2003-05-14 05:09:44 +0000 |
| commit | 100f9a25781695f6e6c0a4a5e17cbbedd16116dc (patch) | |
| tree | d8632acc290ef06c2d9ab018fb30a4580d1e15d3 /sys/dev | |
| parent | 59cd748a52b594531ff4efc77544f54d005f1304 (diff) | |
use our standard way of identifying MII devices
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/mii/eephy.c | 10 | ||||
| -rw-r--r-- | sys/dev/mii/eephyreg.h | 5 |
2 files changed, 4 insertions, 11 deletions
diff --git a/sys/dev/mii/eephy.c b/sys/dev/mii/eephy.c index 8e8975819fc..9bfb4d10577 100644 --- a/sys/dev/mii/eephy.c +++ b/sys/dev/mii/eephy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eephy.c,v 1.8 2002/11/26 06:01:28 nate Exp $ */ +/* $OpenBSD: eephy.c,v 1.9 2003/05/14 05:09:43 nate Exp $ */ /* * Principal Author: Parag Patel * Copyright (c) 2001 @@ -76,12 +76,6 @@ int eephymatch(struct device *parent, void *match, void *aux) { struct mii_attach_args *ma = aux; - u_int32_t id; - - id = ((ma->mii_id1 << 16) | ma->mii_id2) & E1000_ID_MASK; - if (id == E1000_ID_88E1000 || id == E1000_ID_88E1000S) { - return(10); - } if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxMARVELL && (MII_MODEL(ma->mii_id2) == MII_MODEL_xxMARVELL_E1000_3 || @@ -91,6 +85,8 @@ eephymatch(struct device *parent, void *match, void *aux) if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_MARVELL && (MII_MODEL(ma->mii_id2) == MII_MODEL_MARVELL_E1000 || MII_MODEL(ma->mii_id2) == MII_MODEL_MARVELL_E1000_3 || + MII_MODEL(ma->mii_id2) == MII_MODEL_MARVELL_E1000_4 || + MII_MODEL(ma->mii_id2) == MII_MODEL_MARVELL_E1000_5 || MII_MODEL(ma->mii_id2) == MII_MODEL_MARVELL_E1000_6)) return (10); diff --git a/sys/dev/mii/eephyreg.h b/sys/dev/mii/eephyreg.h index c5e2467d606..d04b15190b8 100644 --- a/sys/dev/mii/eephyreg.h +++ b/sys/dev/mii/eephyreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: eephyreg.h,v 1.2 2002/05/04 11:30:06 fgsch Exp $ */ +/* $OpenBSD: eephyreg.h,v 1.3 2003/05/14 05:09:43 nate Exp $ */ /* * Principal Author: Parag Patel * Copyright (c) 2001 @@ -105,9 +105,6 @@ #define E1000_ID1 0x02 /* ID register 1 */ #define E1000_ID2 0x03 /* ID register 2 */ -#define E1000_ID_88E1000 0x01410C50 -#define E1000_ID_88E1000S 0x01410C40 -#define E1000_ID_MASK 0xFFFFFFF0 #define E1000_AR 0x04 /* autonegotiation advertise reg */ #define E1000_AR_SELECTOR_FIELD 0x0001 |