Module Name: src
Committed By: matt
Date: Tue Dec 14 23:29:02 UTC 2010
Modified Files:
src/sys/arch/vax/include: psl.h
Log Message:
Since CLKF_BASEPRI isn't used any more, merge its test into CLKF_INTR which
results in a simplier comparision.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/vax/include/psl.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/vax/include/psl.h
diff -u src/sys/arch/vax/include/psl.h:1.11 src/sys/arch/vax/include/psl.h:1.12
--- src/sys/arch/vax/include/psl.h:1.11 Tue Aug 5 15:56:04 2008
+++ src/sys/arch/vax/include/psl.h Tue Dec 14 23:29:02 2010
@@ -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
