summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorAaron Campbell <aaron@cvs.openbsd.org>2000-06-12 15:17:14 +0000
committerAaron Campbell <aaron@cvs.openbsd.org>2000-06-12 15:17:14 +0000
commitdb49b6d4e493d137c7e9d6898b897be205d24d2c (patch)
tree1de4bfbe4e174cfb0d2962a32dfe0aa69554d252 /sys/dev
parent9c2d0edb089ed09ae249b8c71e4b3e206c41cf6a (diff)
Fix ADMtek identity crisis.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/dc.c14
-rw-r--r--sys/dev/ic/dcreg.h12
2 files changed, 13 insertions, 13 deletions
diff --git a/sys/dev/ic/dc.c b/sys/dev/ic/dc.c
index d8dd0f93f3f..7b1cfd2f197 100644
--- a/sys/dev/ic/dc.c
+++ b/sys/dev/ic/dc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dc.c,v 1.1 2000/04/18 19:35:30 jason Exp $ */
+/* $OpenBSD: dc.c,v 1.2 2000/06/12 15:17:13 aaron Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -44,7 +44,7 @@
* ASIX Electronics AX88140A (www.asix.com.tw)
* ASIX Electronics AX88141 (www.asix.com.tw)
* ADMtek AL981 (www.admtek.com.tw)
- * ADMtek AN985 (www.admtek.com.tw)
+ * ADMtek AN983 (www.admtek.com.tw)
* Davicom DM9100, DM9102 (www.davicom8.com)
*
* Datasheets for the 21143 are available at developer.intel.com.
@@ -261,7 +261,7 @@ void dc_eeprom_putbyte(sc, addr)
register int d, i;
/*
- * The AN985 has a 93C66 EEPROM on it instead of
+ * The AN983 has a 93C66 EEPROM on it instead of
* a 93C46. It uses a different bit sequence for
* specifying the "read" opcode.
*/
@@ -586,10 +586,10 @@ int dc_miibus_readreg(self, phy, reg)
bzero((char *)&frame, sizeof(frame));
/*
- * Note: both the AL981 and AN985 have internal PHYs,
+ * Note: both the AL981 and AN983 have internal PHYs,
* however the AL981 provides direct access to the PHY
- * registers while the AN985 uses a serial MII interface.
- * The AN985's MII interface is also buggy in that you
+ * registers while the AN983 uses a serial MII interface.
+ * The AN983's MII interface is also buggy in that you
* can read from any MII address (0 to 31), but only address 1
* behaves normally. To deal with both cases, we pretend
* that the PHY is at MII address 1.
@@ -1238,7 +1238,7 @@ void dc_attach_common(sc)
DC_EE_NODEADDR, 3, 0);
break;
case DC_TYPE_AL981:
- case DC_TYPE_AN985:
+ case DC_TYPE_AN983:
dc_read_eeprom(sc, (caddr_t)&sc->arpcom.ac_enaddr,
DC_AL_EE_NODEADDR, 3, 0);
break;
diff --git a/sys/dev/ic/dcreg.h b/sys/dev/ic/dcreg.h
index f1d4978b8a0..90431cb3022 100644
--- a/sys/dev/ic/dcreg.h
+++ b/sys/dev/ic/dcreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dcreg.h,v 1.3 2000/04/26 13:58:28 mickey Exp $ */
+/* $OpenBSD: dcreg.h,v 1.4 2000/06/12 15:17:13 aaron Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -73,7 +73,7 @@
#define DC_TYPE_21143 0x4 /* Intel 21143 */
#define DC_TYPE_ASIX 0x5 /* ASIX AX88140A/AX88141 */
#define DC_TYPE_AL981 0x6 /* ADMtek AL981 Comet */
-#define DC_TYPE_AN985 0x7 /* ADMtek AN985 Centaur */
+#define DC_TYPE_AN983 0x7 /* ADMtek AN983 Centaur */
#define DC_TYPE_DM9102 0x8 /* Davicom DM9102 */
#define DC_TYPE_PNICII 0x9 /* 82c115 PNIC II */
#define DC_TYPE_PNIC 0xA /* 82c168/82c169 PNIC I */
@@ -85,12 +85,12 @@
#define DC_IS_ADMTEK(x) \
(x->dc_type == DC_TYPE_AL981 || \
- x->dc_type == DC_TYPE_AN985)
+ x->dc_type == DC_TYPE_AN983)
#define DC_IS_INTEL(x) (x->dc_type == DC_TYPE_21143)
#define DC_IS_ASIX(x) (x->dc_type == DC_TYPE_ASIX)
#define DC_IS_COMET(x) (x->dc_type == DC_TYPE_AL981)
-#define DC_IS_CENTAUR(x) (x->dc_type == DC_TYPE_AN985)
+#define DC_IS_CENTAUR(x) (x->dc_type == DC_TYPE_AN983)
#define DC_IS_DAVICOM(x) (x->dc_type == DC_TYPE_DM9102)
#define DC_IS_PNICII(x) (x->dc_type == DC_TYPE_PNICII)
#define DC_IS_PNIC(x) (x->dc_type == DC_TYPE_PNIC)
@@ -472,8 +472,8 @@ struct dc_mii_frame {
*/
/*
- * ADMtek specific registers and constants for the AL981 and AN985.
- * The AN985 doesn't use the magic PHY registers.
+ * ADMtek specific registers and constants for the AL981 and AN983.
+ * The AN983 doesn't use the magic PHY registers.
*/
#define DC_AL_PAR0 0xA4 /* station address */
#define DC_AL_PAR1 0xA8 /* station address */