diff options
Diffstat (limited to 'sys/arch/mvme68k/include')
| -rw-r--r-- | sys/arch/mvme68k/include/intr.h | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/sys/arch/mvme68k/include/intr.h b/sys/arch/mvme68k/include/intr.h index c6f711cb9aa..bd16c4471f3 100644 --- a/sys/arch/mvme68k/include/intr.h +++ b/sys/arch/mvme68k/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.17 2009/03/01 21:40:49 miod Exp $ */ +/* $OpenBSD: intr.h,v 1.18 2009/03/15 20:40:25 miod Exp $ */ /* * Copyright (C) 2000 Steve Murphree, Jr. * All rights reserved. @@ -34,25 +34,6 @@ #ifdef _KERNEL /* - * Simulated software interrupt register. - */ -extern volatile u_int8_t ssir; - -#define SIR_NET 0x01 -#define SIR_CLOCK 0x02 - -#define siron(mask) \ - __asm __volatile ( "orb %1,%0" : "=m" (ssir) : "ir" (mask)) -#define siroff(mask) \ - __asm __volatile ( "andb %1,%0" : "=m" (ssir) : "ir" (~(mask))) - -#define setsoftint(s) siron(s) -#define setsoftnet() siron(SIR_NET) -#define setsoftclock() siron(SIR_CLOCK) - -u_int8_t allocate_sir(void (*proc)(void *), void *arg); - -/* * Interrupt "levels". These are a more abstract representation * of interrupt levels, and do not have the same meaning as m68k * CPU interrupt levels. They serve two purposes: @@ -61,8 +42,7 @@ u_int8_t allocate_sir(void (*proc)(void *), void *arg); * - compute CPU PSL values for the spl*() calls. */ #define IPL_NONE 0 -#define IPL_SOFTNET 1 -#define IPL_SOFTCLOCK 1 +#define IPL_SOFTINT 1 #define IPL_BIO 2 #define IPL_NET 3 #define IPL_TTY 5 @@ -86,6 +66,8 @@ u_int8_t allocate_sir(void (*proc)(void *), void *arg); /* watch out for side effects */ #define splx(s) ((s) & PSL_IPL ? _spl(s) : spl0()) +#include <m68k/intr.h> /* soft interrupt support */ + /* locore.s */ int spl0(void); |