From 6e7fb9858d45f4f5d0f4f925f4805276b47965d8 Mon Sep 17 00:00:00 2001 From: wpaul Date: Wed, 10 Sep 2003 07:21:43 +0000 Subject: [PATCH] Update hardware revision table. 0x04000000 appears to be the revision for the 8169S, according to my sample board. The RealTek Linux driver mentions 0x00800000. I'm assigning this to the 8110S until I get more info on it. (The (preliminary) RealTek docs only say that 8169S/8110S chips will have some combination of those two bits set, but doesn't say exactly what bit combination goes with which chip variant.) --- sys/dev/re/if_re.c | 9 ++++++--- sys/pci/if_rlreg.h | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/dev/re/if_re.c b/sys/dev/re/if_re.c index ce52c65733da..1ff1853dd050 100644 --- a/sys/dev/re/if_re.c +++ b/sys/dev/re/if_re.c @@ -163,8 +163,10 @@ static struct rl_type re_devs[] = { "RealTek 8139C+ 10/100BaseTX" }, { RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8169, "RealTek 8169 Gigabit Ethernet" }, - { RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8110, - "RealTek 8169S/8110S Single-chip Gigabit Ethernet" }, + { RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8169S, + "RealTek 8169S Single-chip Gigabit Ethernet" }, + { RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8110S, + "RealTek 8110S Single-chip Gigabit Ethernet" }, { 0, 0, 0, NULL } }; @@ -178,7 +180,8 @@ static struct rl_hwrev re_hwrevs[] = { { RL_HWREV_8139D, RL_8139, "8139D/8100B/8100C" }, { RL_HWREV_8139CPLUS, RL_8139CPLUS, "C+"}, { RL_HWREV_8169, RL_8169, "8169"}, - { RL_HWREV_8110, RL_8169, "8169S/8110S"}, + { RL_HWREV_8169S, RL_8169, "8169S"}, + { RL_HWREV_8110S, RL_8169, "8110S"}, { RL_HWREV_8100, RL_8139, "8100"}, { RL_HWREV_8101, RL_8139, "8101"}, { 0, 0, NULL } diff --git a/sys/pci/if_rlreg.h b/sys/pci/if_rlreg.h index 8fe2f823f164..e5103f853971 100644 --- a/sys/pci/if_rlreg.h +++ b/sys/pci/if_rlreg.h @@ -144,7 +144,8 @@ #define RL_LOOPTEST_ON 0x00020000 #define RL_HWREV_8169 0x00000000 -#define RL_HWREV_8110 0x00800000 +#define RL_HWREV_8169S 0x04000000 +#define RL_HWREV_8110S 0x00800000 #define RL_HWREV_8139 0x60000000 #define RL_HWREV_8139A 0x70000000 #define RL_HWREV_8139AG 0x70800000