diff options
| author | Jason Wright <jason@cvs.openbsd.org> | 2003-03-11 18:28:46 +0000 |
|---|---|---|
| committer | Jason Wright <jason@cvs.openbsd.org> | 2003-03-11 18:28:46 +0000 |
| commit | 6ae2e4bfc14aa34508f0fa050d592518fc5da70a (patch) | |
| tree | b43051ef7aa50959d1877249913743a55876c3c9 | |
| parent | 947bc085d1b0cd44f6caa671493997810b164f75 (diff) | |
- Fill in the mm_gtcr column (not currently used)
- fill in the last few rows to avoid a crash on some devices
| -rw-r--r-- | sys/dev/mii/mii_physubr.c | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/sys/dev/mii/mii_physubr.c b/sys/dev/mii/mii_physubr.c index f39a714be41..7864194fd99 100644 --- a/sys/dev/mii/mii_physubr.c +++ b/sys/dev/mii/mii_physubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mii_physubr.c,v 1.14 2002/11/26 06:01:28 nate Exp $ */ +/* $OpenBSD: mii_physubr.c,v 1.15 2003/03/11 18:28:45 jason Exp $ */ /* $NetBSD: mii_physubr.c,v 1.20 2001/04/13 23:30:09 thorpej Exp $ */ /*- @@ -62,14 +62,26 @@ * XXX 802.3 doesn't specify ANAR or ANLPAR bits for 1000base. */ const struct mii_media mii_media_table[] = { - { BMCR_ISO, ANAR_CSMA }, /* None */ - { BMCR_S10, ANAR_CSMA|ANAR_10 }, /* 10baseT */ - { BMCR_S10|BMCR_FDX, ANAR_CSMA|ANAR_10_FD }, /* 10baseT-FDX */ - { BMCR_S100, ANAR_CSMA|ANAR_T4 }, /* 100baseT4 */ - { BMCR_S100, ANAR_CSMA|ANAR_TX }, /* 100baseTX */ - { BMCR_S100|BMCR_FDX, ANAR_CSMA|ANAR_TX_FD }, /* 100baseTX-FDX */ - { BMCR_S1000, ANAR_CSMA }, /* 1000base */ - { BMCR_S1000|BMCR_FDX, ANAR_CSMA }, /* 1000base-FDX */ + /* None */ + { BMCR_ISO, ANAR_CSMA, 0 }, + /* 10baseT */ + { BMCR_S10, ANAR_CSMA|ANAR_10, 0 }, + /* 10baseT-FDX */ + { BMCR_S10|BMCR_FDX, ANAR_CSMA|ANAR_10_FD, 0 }, + /* 100baseT4 */ + { BMCR_S100, ANAR_CSMA|ANAR_T4, 0 }, + /* 100baseTX */ + { BMCR_S100, ANAR_CSMA|ANAR_TX, 0 }, + /* 100baseTX-FDX */ + { BMCR_S100|BMCR_FDX, ANAR_CSMA|ANAR_TX_FD, 0 }, + /* 1000baseX */ + { BMCR_S1000, ANAR_CSMA, 0 }, + /* 1000baseX-FDX */ + { BMCR_S1000|BMCR_FDX, ANAR_CSMA, 0 }, + /* 1000baseT */ + { BMCR_S1000, ANAR_CSMA, GTCR_ADV_1000THDX }, + /* 1000baseT-FDX */ + { BMCR_S1000|BMCR_FDX, ANAR_CSMA, GTCR_ADV_1000TFDX }, }; void mii_phy_auto_timeout(void *); |