summaryrefslogtreecommitdiff
path: root/sys/arch/mac68k/include
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2003-01-05 01:51:28 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2003-01-05 01:51:28 +0000
commit35eb04d8442f225f79f63b881426d9c3a1b68245 (patch)
tree597215b5c61ae77b81c3ca3ec7dad23151f90ad9 /sys/arch/mac68k/include
parent57aa6227eec11ee3adc1e0937b05ecc71da6c47e (diff)
splassert on m68k-based arches. Not totally accurate on hp300 at the moment,
still.
Diffstat (limited to 'sys/arch/mac68k/include')
-rw-r--r--sys/arch/mac68k/include/intr.h23
1 files changed, 19 insertions, 4 deletions
diff --git a/sys/arch/mac68k/include/intr.h b/sys/arch/mac68k/include/intr.h
index 7c6a80913fb..f96958e377c 100644
--- a/sys/arch/mac68k/include/intr.h
+++ b/sys/arch/mac68k/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.7 2002/04/29 07:35:19 miod Exp $ */
+/* $OpenBSD: intr.h,v 1.8 2003/01/05 01:51:27 miod Exp $ */
/* $NetBSD: intr.h,v 1.8 1997/11/07 07:33:18 scottr Exp $ */
/*
@@ -36,9 +36,6 @@
* spl functions; all but spl0 are done in-line
*/
-/* SPL asserts */
-#define splassert(wantipl) /* nothing */
-
#define _spl(s) \
({ \
register int _spl_r; \
@@ -95,6 +92,24 @@ extern unsigned short mac68k_clockipl;
extern unsigned short mac68k_statclockipl;
/*
+ * Interrupt "levels". These are a more abstract representation
+ * of interrupt levels, and do not have the same meaning as m68k
+ * CPU interrupt levels. They serve two purposes:
+ *
+ * - properly order ISRs in the list for that CPU ipl
+ * - compute CPU PSL values for the spl*() calls.
+ */
+#define IPL_NONE 0
+#define IPL_SOFTNET 1
+#define IPL_SOFTCLOCK 1
+#define IPL_BIO PSLTOIPL(mac68k_bioipl)
+#define IPL_NET PSLTOIPL(mac68k_netipl)
+#define IPL_TTY PSLTOIPL(mac68k_ttyipl)
+#define IPL_CLOCK PSLTOIPL(mac68k_clockipl)
+#define IPL_STATCLOCK PSLTOIPL(mac68k_statclockipl)
+#define IPL_HIGH 7
+
+/*
* These should be used for:
* 1) ensuring mutual exclusion (why use processor level?)
* 2) allowing faster devices to take priority