diff options
| author | kstailey <kstailey@cvs.openbsd.org> | 1997-02-14 23:50:21 +0000 |
|---|---|---|
| committer | kstailey <kstailey@cvs.openbsd.org> | 1997-02-14 23:50:21 +0000 |
| commit | 05a12aee2d76339b83614fd0d377c4a31d49bbb7 (patch) | |
| tree | 6da88fc4c1b37859669551cceb26ff86927fe082 /sys/arch/sun3/include | |
| parent | d40be87b27a714db7a459a0e6d4dcdad7814aea5 (diff) | |
back out changes to rei function
Diffstat (limited to 'sys/arch/sun3/include')
| -rw-r--r-- | sys/arch/sun3/include/machdep.h | 9 | ||||
| -rw-r--r-- | sys/arch/sun3/include/param.h | 11 |
2 files changed, 11 insertions, 9 deletions
diff --git a/sys/arch/sun3/include/machdep.h b/sys/arch/sun3/include/machdep.h index 82c3573552a..f53af4afbdb 100644 --- a/sys/arch/sun3/include/machdep.h +++ b/sys/arch/sun3/include/machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.h,v 1.5 1997/02/14 19:24:04 kstailey Exp $ */ +/* $OpenBSD: machdep.h,v 1.6 1997/02/14 23:50:17 kstailey Exp $ */ /* * Copyright (c) 1994 Gordon W. Ross * Copyright (c) 1993 Adam Glass @@ -45,9 +45,14 @@ #ifdef _KERNEL -#define FC_CONTROL 3 /* sun control space +#define FC_CONTROL 3 /* sun control space XXX HP uses FC_PURGE instead */ +#define SPL1 (PSL_S | PSL_IPL1); /* used in locore.s + * XXX mvme68k does this in + * genassym.c + */ + /* Prototypes... */ struct frame; diff --git a/sys/arch/sun3/include/param.h b/sys/arch/sun3/include/param.h index e331b93b7e5..b9884ddb106 100644 --- a/sys/arch/sun3/include/param.h +++ b/sys/arch/sun3/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.12 1997/02/14 19:24:05 kstailey Exp $ */ +/* $OpenBSD: param.h,v 1.13 1997/02/14 23:50:18 kstailey Exp $ */ /* $NetBSD: param.h,v 1.34 1996/03/04 05:04:40 cgd Exp $ */ /* @@ -150,7 +150,7 @@ #define sun3_ptob(x) ((unsigned)(x) << PGSHIFT) /* - * spl functions; all but spl0 are done in-line + * spl functions; all are done in-line */ #include <machine/psl.h> @@ -171,6 +171,7 @@ * have no need to check for any simulated interrupts, etc. */ +#define spl0() _spl(PSL_S|PSL_IPL0) #define spl1() _spl(PSL_S|PSL_IPL1) #define spl2() _spl(PSL_S|PSL_IPL2) #define spl3() _spl(PSL_S|PSL_IPL3) @@ -178,6 +179,7 @@ #define spl5() _spl(PSL_S|PSL_IPL5) #define spl6() _spl(PSL_S|PSL_IPL6) #define spl7() _spl(PSL_S|PSL_IPL7) +#define splx(x) _spl(x) /* IPL used by soft interrupts: netintr(), softclock() */ #define splsoftclock() spl1() @@ -206,11 +208,6 @@ #define splhigh() spl7() #define splsched() spl7() -void spl0 __P((void)); /* XXX where should this go? */ - -/* watch out for side effects */ -#define splx(s) (s & PSL_IPL ? _spl(s) : spl0()) - /* Get current sr value (debug, etc.) */ extern int getsr __P((void)); |