diff options
| author | Martin Reindl <martin@cvs.openbsd.org> | 2004-12-02 22:00:32 +0000 |
|---|---|---|
| committer | Martin Reindl <martin@cvs.openbsd.org> | 2004-12-02 22:00:32 +0000 |
| commit | 456c0edf834b3ad1c6fe2c152932c6f2972f631b (patch) | |
| tree | 93dd3d503f92b3f8d201c2395fc29af5cb59a306 /sys/arch/mac68k/include/intr.h | |
| parent | 3abfb88126ee6cfd3c7e729a8bd70c476e4091bb (diff) | |
move IPL setup to intr.c
ok miod@
>From: NetBSD
Diffstat (limited to 'sys/arch/mac68k/include/intr.h')
| -rw-r--r-- | sys/arch/mac68k/include/intr.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/sys/arch/mac68k/include/intr.h b/sys/arch/mac68k/include/intr.h index e043d428349..d17def7d0bb 100644 --- a/sys/arch/mac68k/include/intr.h +++ b/sys/arch/mac68k/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.10 2004/11/26 21:21:27 miod Exp $ */ +/* $OpenBSD: intr.h,v 1.11 2004/12/02 22:00:31 martin Exp $ */ /* $NetBSD: intr.h,v 1.9 1998/08/12 06:58:42 scottr Exp $ */ /* @@ -84,12 +84,13 @@ * splnet must block hardware network interrupts * splimp must be > spltty */ -extern unsigned short mac68k_ttyipl; -extern unsigned short mac68k_bioipl; -extern unsigned short mac68k_netipl; -extern unsigned short mac68k_impipl; -extern unsigned short mac68k_clockipl; -extern unsigned short mac68k_statclockipl; +extern u_short mac68k_ttyipl; +extern u_short mac68k_bioipl; +extern u_short mac68k_netipl; +extern u_short mac68k_impipl; +extern u_short mac68k_audioipl; +extern u_short mac68k_clockipl; +extern u_short mac68k_statclockipl; /* * Interrupt "levels". These are a more abstract representation @@ -118,7 +119,6 @@ extern unsigned short mac68k_statclockipl; * everything at spl2, and everything but the panic switch and * power at spl4. */ -#define spllowersoftclock() splsoft() #define splsoftclock() splsoft() #define splsoftnet() splsoft() #define spltty() _splraise(mac68k_ttyipl) @@ -126,6 +126,7 @@ extern unsigned short mac68k_statclockipl; #define splnet() _splraise(mac68k_netipl) #define splimp() _splraise(mac68k_impipl) #define splvm() _splraise(mac68k_impipl) +#define splaudio() _splraise(mac68k_audioipl) #define splclock() _splraise(mac68k_clockipl) #define splstatclock() _splraise(mac68k_statclockipl) #define splserial() spl4() @@ -157,6 +158,7 @@ extern volatile u_int8_t ssir; #define setsoftadb() siron(SIR_ADB) /* intr.c */ +void intr_init(void); void intr_establish(int (*)(void *), void *, int, const char *); void intr_disestablish(int); void intr_dispatch(int); |