diff options
| author | Dale Rahn <drahn@cvs.openbsd.org> | 2006-06-15 21:35:31 +0000 |
|---|---|---|
| committer | Dale Rahn <drahn@cvs.openbsd.org> | 2006-06-15 21:35:31 +0000 |
| commit | eb72c88524d7fac5c9a2ccb8306990a74581b569 (patch) | |
| tree | b058d1608e53e69a7360eb5c4200d3f52b305e56 /sys/arch/armish/include | |
| parent | e14575985cf7a5cf6a4769c170aa0467b191db28 (diff) | |
rewritten, simplifed interrupt controller for 80321, half the lines
and much less complex. IPL_SERIAL goes at the same time.
Diffstat (limited to 'sys/arch/armish/include')
| -rw-r--r-- | sys/arch/armish/include/armish_intr.h | 4 | ||||
| -rw-r--r-- | sys/arch/armish/include/intr.h | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sys/arch/armish/include/armish_intr.h b/sys/arch/armish/include/armish_intr.h index 48f8153a5f7..13d1c78d879 100644 --- a/sys/arch/armish/include/armish_intr.h +++ b/sys/arch/armish/include/armish_intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: armish_intr.h,v 1.1 2006/05/29 17:13:19 drahn Exp $ */ +/* $OpenBSD: armish_intr.h,v 1.2 2006/06/15 21:35:30 drahn Exp $ */ /* $NetBSD: i80321_intr.h,v 1.4 2003/07/05 06:53:08 dogcow Exp $ */ /* @@ -48,7 +48,7 @@ #include <machine/intr.h> #include <arm/softintr.h> -extern __volatile int current_spl_level; +extern __volatile int current_ipl_level; extern __volatile int softint_pending; extern int i80321_imask[]; void i80321_do_pending(void); diff --git a/sys/arch/armish/include/intr.h b/sys/arch/armish/include/intr.h index 8dde9f16f8f..32b059024a4 100644 --- a/sys/arch/armish/include/intr.h +++ b/sys/arch/armish/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.2 2006/05/31 18:01:05 miod Exp $ */ +/* $OpenBSD: intr.h,v 1.3 2006/06/15 21:35:30 drahn Exp $ */ /* $NetBSD: intr.h,v 1.12 2003/06/16 20:00:59 thorpej Exp $ */ /* @@ -56,9 +56,8 @@ #define IPL_CLOCK 10 /* clock interrupt */ #define IPL_STATCLOCK 11 /* statistics clock interrupt */ #define IPL_HIGH 12 /* everything */ -#define IPL_SERIAL 13 /* serial device */ -#define NIPL 14 +#define NIPL 13 /* Interrupt sharing types. */ #define IST_NONE 0 /* none */ @@ -132,7 +131,6 @@ void _setsoftintr(int); #define splaudio() _splraise(IPL_AUDIO) #define splclock() _splraise(IPL_CLOCK) #define splstatclock() _splraise(IPL_STATCLOCK) -#define splserial() _splraise(IPL_SERIAL) #define spl0() _spllower(IPL_NONE) |