[src/trunk]: src/sys/arch/vax/include Since CLKF_BASEPRI isn't used any more, ...

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

details:   https://anonhg.NetBSD.org/src/rev/9641719f947e
branches:  trunk
changeset: 759685:9641719f947e
user:      matt <matt%NetBSD.org@localhost>
date:      Tue Dec 14 23:29:02 2010 +0000

description:
Since CLKF_BASEPRI isn't used any more, merge its test into CLKF_INTR which
results in a simplier comparision.

diffstat:

 sys/arch/vax/include/psl.h |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (24 lines):

diff -r 45f0a17fa9e8 -r 9641719f947e sys/arch/vax/include/psl.h
--- a/sys/arch/vax/include/psl.h        Tue Dec 14 23:27:47 2010 +0000
+++ b/sys/arch/vax/include/psl.h        Tue Dec 14 23:29:02 2010 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: psl.h,v 1.11 2008/08/05 15:56:04 matt Exp $      */
+/*      $NetBSD: psl.h,v 1.12 2010/12/14 23:29:02 matt Exp $      */
 
 /*
  * Rewritten for the VAX port. Based on Berkeley code. /IC
@@ -102,11 +102,10 @@
 /*
  * Macros to decode processor status word.
  */
-#define        CLKF_USERMODE(framep)   ((((framep)->ps) & (PSL_U)) == PSL_U)
-#define        CLKF_BASEPRI(framep)    ((((framep)->ps) & (PSL_IPL1F)) < PSL_IPL02)
+#define        CLKF_USERMODE(framep)   (((framep)->ps & PSL_U) == PSL_U)
 #define        CLKF_PC(framep)         ((framep)->pc)
-#define        CLKF_INTR(framep)       (((((framep)->ps) & (PSL_IS)) == PSL_IS) && \
-                                   !CLKF_BASEPRI(framep))
+#define        CLKF_INTR(framep)       (((framep)->ps & (PSL_IS|PSL_IPL1F)) \
+                                   >= (PSL_IPL02|PSL_IS))
 #define PSL2IPL(ps)             ((ps) >> 16)
 
 #endif