summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Rees <rees@cvs.openbsd.org>1997-11-13 21:12:14 +0000
committerJim Rees <rees@cvs.openbsd.org>1997-11-13 21:12:14 +0000
commitaf2624200228954809f8ca7584e236289b4f3f53 (patch)
treee1ff26a08dbf7d73fb6cd1bd7c9ec1a978c78c3f
parent3ddfd7de2d542f3c51c91d0225423f44f7fe101a (diff)
merge netbsd 1.13
-rw-r--r--sys/dev/ic/dc21040reg.h32
1 files changed, 25 insertions, 7 deletions
diff --git a/sys/dev/ic/dc21040reg.h b/sys/dev/ic/dc21040reg.h
index 5a9de000a30..e422c2e748a 100644
--- a/sys/dev/ic/dc21040reg.h
+++ b/sys/dev/ic/dc21040reg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dc21040reg.h,v 1.5 1997/07/29 19:31:49 downsj Exp $ */
+/* $OpenBSD: dc21040reg.h,v 1.6 1997/11/13 21:12:13 rees Exp $ */
/* $NetBSD: dc21040reg.h,v 1.11 1997/06/08 18:44:02 thorpej Exp $ */
/*-
@@ -202,6 +202,7 @@ typedef struct {
#define TULIP_SIASTS_OTHERRXACTIVITY 0x00000200L
#define TULIP_SIASTS_RXACTIVITY 0x00000100L
#define TULIP_SIASTS_LINKFAIL 0x00000004L
+#define TULIP_SIASTS_LINK100FAIL 0x00000002L
#define TULIP_SIACONN_RESET 0x00000000L
/*
@@ -274,19 +275,19 @@ typedef struct {
#define TULIP_21142_PROBE_AUIBNC_TIMEOUT 300
#define TULIP_21142_SIACONN_10BASET 0x00000001L
-#define TULIP_21142_SIATXRX_10BASET 0x0000F3FFL
-#define TULIP_21142_SIAGEN_10BASET 0x00000000L
+#define TULIP_21142_SIATXRX_10BASET 0x00007F3FL
+#define TULIP_21142_SIAGEN_10BASET 0x00000008L
#define TULIP_21142_SIACONN_10BASET_FD 0x00000001L
-#define TULIP_21142_SIATXRX_10BASET_FD 0x0000F3FDL
-#define TULIP_21142_SIAGEN_10BASET_FD 0x00000000L
+#define TULIP_21142_SIATXRX_10BASET_FD 0x00007F3DL
+#define TULIP_21142_SIAGEN_10BASET_FD 0x00000008L
#define TULIP_21142_SIACONN_AUI 0x00000009L
-#define TULIP_21142_SIATXRX_AUI 0x0000F3FDL
+#define TULIP_21142_SIATXRX_AUI 0x00000705L
#define TULIP_21142_SIAGEN_AUI 0x0000000EL
#define TULIP_21142_SIACONN_BNC 0x00000009L
-#define TULIP_21142_SIATXRX_BNC 0x0000F3FDL
+#define TULIP_21142_SIATXRX_BNC 0x00000705L
#define TULIP_21142_SIAGEN_BNC 0x00000006L
@@ -436,6 +437,23 @@ typedef struct {
#define TULIP_GP_ASANTE_PHYRESET 0x00000008 /* Reset PHY */
/*
+ * ACCTON EN1207 specialties
+ */
+
+#define TULIP_OUI_EN1207_0 0x00
+#define TULIP_OUI_EN1207_1 0x00
+#define TULIP_OUI_EN1207_2 0xE8
+
+#define TULIP_CSR8_EN1207 0x08
+#define TULIP_CSR9_EN1207 0x00
+#define TULIP_CSR10_EN1207 0x03
+#define TULIP_CSR11_EN1207 0x1F
+
+#define TULIP_GP_EN1207_BNC_INIT 0x0000011B
+#define TULIP_GP_EN1207_UTP_INIT 0x9E00000B
+#define TULIP_GP_EN1207_100_INIT 0x6D00031B
+
+/*
* SROM definitions for the 21140 and 21041.
*/
#define SROMXREG 0x0400