summaryrefslogtreecommitdiff
path: root/sys/dev/ic
diff options
context:
space:
mode:
authorTodd T. Fries <todd@cvs.openbsd.org>2006-12-01 01:13:02 +0000
committerTodd T. Fries <todd@cvs.openbsd.org>2006-12-01 01:13:02 +0000
commiteb9445f92b3f81eae749ecb3754af2c306b4b41a (patch)
treef455fdff4724afd915e3d1fa561da4d7b925cf8a /sys/dev/ic
parent1eb54dc08628549d35a31b42f7d1cef3db072061 (diff)
rename 8100E id to spin 1 and add the 8100E second spin chip id
chip id from Linux r8169 driver from brad@
Diffstat (limited to 'sys/dev/ic')
-rw-r--r--sys/dev/ic/re.c5
-rw-r--r--sys/dev/ic/rtl81x9reg.h5
2 files changed, 6 insertions, 4 deletions
diff --git a/sys/dev/ic/re.c b/sys/dev/ic/re.c
index bf106eb7d5e..85fb00a2ca3 100644
--- a/sys/dev/ic/re.c
+++ b/sys/dev/ic/re.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: re.c,v 1.56 2006/11/28 23:00:13 brad Exp $ */
+/* $OpenBSD: re.c,v 1.57 2006/12/01 01:13:01 todd Exp $ */
/* $FreeBSD: if_re.c,v 1.31 2004/09/04 07:54:05 ru Exp $ */
/*
* Copyright (c) 1997, 1998-2003
@@ -212,9 +212,10 @@ static const struct re_revision {
{ RL_HWREV_8169_8110SB, "RTL8169/8110SB" },
{ RL_HWREV_8169_8110SC, "RTL8169/8110SC" },
{ RL_HWREV_8168_SPIN1, "RTL8168 1" },
- { RL_HWREV_8100E, "RTL8100E" },
+ { RL_HWREV_8100E_SPIN1, "RTL8100E 1" },
{ RL_HWREV_8101E, "RTL8101E" },
{ RL_HWREV_8168_SPIN2, "RTL8168 2" },
+ { RL_HWREV_8100E_SPIN2, "RTL8100E 2" },
{ RL_HWREV_8139CPLUS, "RTL8139C+" },
{ RL_HWREV_8101, "RTL8101" },
{ RL_HWREV_8100, "RTL8100" },
diff --git a/sys/dev/ic/rtl81x9reg.h b/sys/dev/ic/rtl81x9reg.h
index 2e069437c60..1a0634161c1 100644
--- a/sys/dev/ic/rtl81x9reg.h
+++ b/sys/dev/ic/rtl81x9reg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rtl81x9reg.h,v 1.34 2006/11/26 10:58:16 jsg Exp $ */
+/* $OpenBSD: rtl81x9reg.h,v 1.35 2006/12/01 01:13:01 todd Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -154,9 +154,10 @@
#define RL_HWREV_8169_8110SB 0x10000000
#define RL_HWREV_8169_8110SC 0x18000000
#define RL_HWREV_8168_SPIN1 0x30000000
-#define RL_HWREV_8100E 0x30800000
+#define RL_HWREV_8100E_SPIN1 0x30800000
#define RL_HWREV_8101E 0x34000000
#define RL_HWREV_8168_SPIN2 0x38000000
+#define RL_HWREV_8100E_SPIN2 0x38800000
#define RL_HWREV_8139 0x60000000
#define RL_HWREV_8139A 0x70000000
#define RL_HWREV_8139AG 0x70800000