diff options
Diffstat (limited to 'sys/arch/sgi/include')
| -rw-r--r-- | sys/arch/sgi/include/intr.h | 3 | ||||
| -rw-r--r-- | sys/arch/sgi/include/psl.h | 39 |
2 files changed, 2 insertions, 40 deletions
diff --git a/sys/arch/sgi/include/intr.h b/sys/arch/sgi/include/intr.h index 1b2e9924ff7..dbb721bab9c 100644 --- a/sys/arch/sgi/include/intr.h +++ b/sys/arch/sgi/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.23 2009/05/21 16:08:05 miod Exp $ */ +/* $OpenBSD: intr.h,v 1.24 2009/05/22 20:37:53 miod Exp $ */ /* * Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -220,6 +220,7 @@ void hw_setintrmask(intrmask_t); extern void *hwmask_addr; #endif +u_int32_t updateimask(intrmask_t); void dosoftint(intrmask_t); #endif /* _LOCORE */ diff --git a/sys/arch/sgi/include/psl.h b/sys/arch/sgi/include/psl.h deleted file mode 100644 index d58f97d35c7..00000000000 --- a/sys/arch/sgi/include/psl.h +++ /dev/null @@ -1,39 +0,0 @@ -/* $OpenBSD: psl.h,v 1.2 2004/08/10 18:52:58 deraadt Exp $ */ - -/* - * Copyright (c) 2003-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS - * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - */ -#include <machine/cpu.h> - -/* - * Macros to decode processor status word. - */ -#define USERMODE(ps) (((ps) & SR_KSU_MASK) == SR_KSU_USER) -#define BASEPRI(ps) (((ps) & (INT_MASK | SR_INT_ENA_PREV)) == \ - (INT_MASK | SR_INT_ENA_PREV)) - -#ifdef _KERNEL -#include <machine/intr.h> -#endif |