summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authormycroft <mycroft@NetBSD.org>1995-04-04 01:59:28 +0000
committermycroft <mycroft@NetBSD.org>1995-04-04 01:59:28 +0000
commit0e67f2a78ee87b83ea024d7c8195a49ed9df250b (patch)
tree88d3b3e1511cf81a9c3b017ede7a421b59308c1b /sys/dev
parent13ac06ec6a3dde041b14303df657154addaa656e (diff)
Rename a few constants to match the chip documentation.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/i82586.h14
-rw-r--r--sys/dev/ic/i82586reg.h14
-rw-r--r--sys/dev/isa/if_ie.c8
3 files changed, 18 insertions, 18 deletions
diff --git a/sys/dev/ic/i82586.h b/sys/dev/ic/i82586.h
index a3a8b5e2ee2..7af3e655685 100644
--- a/sys/dev/ic/i82586.h
+++ b/sys/dev/ic/i82586.h
@@ -1,4 +1,4 @@
-/* $NetBSD: i82586.h,v 1.4 1995/04/03 21:17:20 mycroft Exp $ */
+/* $NetBSD: i82586.h,v 1.5 1995/04/04 01:59:34 mycroft Exp $ */
/*-
* Copyright (c) 1992, University of Vermont and State Agricultural College.
@@ -105,9 +105,9 @@ struct ie_sys_ctl_block {
#define IE_CU_ABORT 0x0400 /* abort current command */
#define IE_ACK_COMMAND 0xf000 /* mask for ACK command */
-#define IE_ACK_CX 0x8000 /* ack IE_ST_DONE */
-#define IE_ACK_FR 0x4000 /* ack IE_ST_RECV */
-#define IE_ACK_CNA 0x2000 /* ack IE_ST_ALLDONE */
+#define IE_ACK_CX 0x8000 /* ack IE_ST_CX */
+#define IE_ACK_FR 0x4000 /* ack IE_ST_FR */
+#define IE_ACK_CNA 0x2000 /* ack IE_ST_CNA */
#define IE_ACK_RNR 0x1000 /* ack IE_ST_RNR */
#define IE_ACTION_COMMAND(x) (((x) & IE_CU_COMMAND) == IE_CU_START)
@@ -115,9 +115,9 @@ struct ie_sys_ctl_block {
/* Status values */
#define IE_ST_WHENCE 0xf000 /* mask for cause of interrupt */
-#define IE_ST_DONE 0x8000 /* command with I bit completed */
-#define IE_ST_RECV 0x4000 /* frame received */
-#define IE_ST_ALLDONE 0x2000 /* all commands completed */
+#define IE_ST_CX 0x8000 /* command with I bit completed */
+#define IE_ST_FR 0x4000 /* frame received */
+#define IE_ST_CNA 0x2000 /* all commands completed */
#define IE_ST_RNR 0x1000 /* receive not ready */
#define IE_CU_STATUS 0x700 /* mask for command unit status */
diff --git a/sys/dev/ic/i82586reg.h b/sys/dev/ic/i82586reg.h
index 5ee8b3316f1..fefaed3e346 100644
--- a/sys/dev/ic/i82586reg.h
+++ b/sys/dev/ic/i82586reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: i82586reg.h,v 1.4 1995/04/03 21:17:20 mycroft Exp $ */
+/* $NetBSD: i82586reg.h,v 1.5 1995/04/04 01:59:34 mycroft Exp $ */
/*-
* Copyright (c) 1992, University of Vermont and State Agricultural College.
@@ -105,9 +105,9 @@ struct ie_sys_ctl_block {
#define IE_CU_ABORT 0x0400 /* abort current command */
#define IE_ACK_COMMAND 0xf000 /* mask for ACK command */
-#define IE_ACK_CX 0x8000 /* ack IE_ST_DONE */
-#define IE_ACK_FR 0x4000 /* ack IE_ST_RECV */
-#define IE_ACK_CNA 0x2000 /* ack IE_ST_ALLDONE */
+#define IE_ACK_CX 0x8000 /* ack IE_ST_CX */
+#define IE_ACK_FR 0x4000 /* ack IE_ST_FR */
+#define IE_ACK_CNA 0x2000 /* ack IE_ST_CNA */
#define IE_ACK_RNR 0x1000 /* ack IE_ST_RNR */
#define IE_ACTION_COMMAND(x) (((x) & IE_CU_COMMAND) == IE_CU_START)
@@ -115,9 +115,9 @@ struct ie_sys_ctl_block {
/* Status values */
#define IE_ST_WHENCE 0xf000 /* mask for cause of interrupt */
-#define IE_ST_DONE 0x8000 /* command with I bit completed */
-#define IE_ST_RECV 0x4000 /* frame received */
-#define IE_ST_ALLDONE 0x2000 /* all commands completed */
+#define IE_ST_CX 0x8000 /* command with I bit completed */
+#define IE_ST_FR 0x4000 /* frame received */
+#define IE_ST_CNA 0x2000 /* all commands completed */
#define IE_ST_RNR 0x1000 /* receive not ready */
#define IE_CU_STATUS 0x700 /* mask for command unit status */
diff --git a/sys/dev/isa/if_ie.c b/sys/dev/isa/if_ie.c
index fbc26a3de0d..bda2968c0c2 100644
--- a/sys/dev/isa/if_ie.c
+++ b/sys/dev/isa/if_ie.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie.c,v 1.35 1995/04/04 01:44:23 mycroft Exp $ */
+/* $NetBSD: if_ie.c,v 1.36 1995/04/04 01:59:28 mycroft Exp $ */
/*-
* Copyright (c) 1993, 1994, 1995 Charles Hannum.
@@ -596,7 +596,7 @@ loop:
/* Ack interrupts FIRST in case we receive more during the ISR. */
ie_ack(sc, status);
- if (status & (IE_ST_RECV | IE_ST_RNR)) {
+ if (status & (IE_ST_FR | IE_ST_RNR)) {
#ifdef IEDEBUG
in_ierint++;
if (sc->sc_debug & IED_RINT)
@@ -608,7 +608,7 @@ loop:
#endif
}
- if (status & IE_ST_DONE) {
+ if (status & IE_ST_CX) {
#ifdef IEDEBUG
in_ietint++;
if (sc->sc_debug & IED_TINT)
@@ -627,7 +627,7 @@ loop:
}
#ifdef IEDEBUG
- if ((status & IE_ST_ALLDONE) && (sc->sc_debug & IED_CNA))
+ if ((status & IE_ST_CNA) && (sc->sc_debug & IED_CNA))
printf("%s: cna\n", sc->sc_dev.dv_xname);
#endif