[src/trunk]: src/sys/arch/next68k/include renamed splscc to splserial to matc...

[dbj <dbj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4e2a791bc5a6
branches:  trunk
changeset: 474306:4e2a791bc5a6
user:      dbj <dbj%NetBSD.org@localhost>
date:      Sat Jul 03 08:22:53 1999 +0000

description:
renamed splscc to splserial to match spl(9) man page
changed most of the spl* to use _splraise to match current usage
this fixes an observed bug where zstty_attach was calling splzs causing
interrupts to be turned on prematurely.

diffstat:

 sys/arch/next68k/include/intr.h     |  49 +++++++++---------------------------
 sys/arch/next68k/include/z8530var.h |   4 +-
 2 files changed, 14 insertions(+), 39 deletions(-)

diffs (83 lines):

diff -r 93aa66753af2 -r 4e2a791bc5a6 sys/arch/next68k/include/intr.h
--- a/sys/arch/next68k/include/intr.h   Sat Jul 03 07:00:42 1999 +0000
+++ b/sys/arch/next68k/include/intr.h   Sat Jul 03 08:22:53 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.h,v 1.3 1999/06/15 15:26:34 kleink Exp $  */
+/*     $NetBSD: intr.h,v 1.4 1999/07/03 08:22:53 dbj Exp $     */
 
 /*
  * Copyright (C) 1997 Scott Reynolds
@@ -84,44 +84,19 @@
 
 /****************************************************************/
 
-#define spldma()        spl6()
-
-#define splscc()        spl5()
-
-#define splsched()      spl3()
-
-/* IPL used by soft interrupts: netintr(), softclock() */
+#define splhigh()       spl7()
+#define splserial()     _splraise(PSL_S|PSL_IPL5)
+#define splsched()      _splraise(PSL_S|PSL_IPL3)
+#define splclock()      _splraise(PSL_S|PSL_IPL6)
+#define splstatclock()  splclock()
+#define splimp()        _splraise(PSL_S|PSL_IPL6)
+#define spltty()        _splraise(PSL_S|PSL_IPL3)
+#define splbio()        _splraise(PSL_S|PSL_IPL3)
+#define splnet()        _splraise(PSL_S|PSL_IPL3)
+#define splsoftnet()    _splraise(PSL_S|PSL_IPL2)
 #define splsoftclock()  spl1()
-#define splsoftnet()    spl2()
-
-
-/* Highest block device (strategy) IPL. */
-#define splbio()        spl3()
-
-/* Highest tty device IPL. */
-#define spltty()        spl1()
 
-/* Highest network interface IPL. */
-#define splnet()        spl2()
-
-/*
- * Requirement: imp >= (highest network, tty, or disk IPL)
- * This is used mostly in the VM code. (Why not splvm?)
- * Note that the VM code runs at spl7 during kernel
- * initialization, and later at spl0, so we have to 
- * use splraise to avoid enabling interrupts early.
- */
-#if 0
-#define splimp()        _splraise(PSL_S|PSL_IPL3)
-#else
-#define splimp()        _splraise(PSL_S|PSL_IPL6)
-#endif
-
-#define splclock()      spl6()
-#define splstatclock()  splclock()
-
-/* Block out all interrupts (except NMI of course). */
-#define splhigh()       spl7()
+#define spldma()        _splraise(PSL_S|PSL_IPL6)
 
 /****************************************************************/
 
diff -r 93aa66753af2 -r 4e2a791bc5a6 sys/arch/next68k/include/z8530var.h
--- a/sys/arch/next68k/include/z8530var.h       Sat Jul 03 07:00:42 1999 +0000
+++ b/sys/arch/next68k/include/z8530var.h       Sat Jul 03 08:22:53 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: z8530var.h,v 1.1.1.1 1998/06/09 07:53:05 dbj Exp $     */
+/*     $NetBSD: z8530var.h,v 1.2 1999/07/03 08:22:56 dbj Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -44,7 +44,7 @@
  *     @(#)zsvar.h     8.1 (Berkeley) 6/11/93
  */
 
-#define splzs() splscc()
+#define splzs() splserial()
 
 #include <dev/ic/z8530sc.h>