diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/i386/include/intr.h | 18 | ||||
| -rw-r--r-- | sys/arch/i386/isa/isa_machdep.c | 3 | ||||
| -rw-r--r-- | sys/dev/audio_if.h | 6 | ||||
| -rw-r--r-- | sys/dev/isa/mpu401.c | 4 | ||||
| -rw-r--r-- | sys/dev/sequencer.c | 4 |
5 files changed, 21 insertions, 14 deletions
diff --git a/sys/arch/i386/include/intr.h b/sys/arch/i386/include/intr.h index 7c602bf9220..897b0e78401 100644 --- a/sys/arch/i386/include/intr.h +++ b/sys/arch/i386/include/intr.h @@ -33,13 +33,14 @@ #define _I386_INTR_H_ /* Interrupt priority `levels'; not mutually exclusive. */ -#define IPL_BIO 0 /* block I/O */ -#define IPL_NET 1 /* network */ -#define IPL_TTY 2 /* terminal */ -#define IPL_CLOCK 3 /* clock */ +#define IPL_NONE 0 /* nothing */ +#define IPL_BIO 1 /* block I/O */ +#define IPL_NET 2 /* network */ +#define IPL_TTY 3 /* terminal */ #define IPL_IMP 4 /* memory allocation */ -#define IPL_NONE 5 /* nothing */ -#define IPL_HIGH 6 /* everything */ +#define IPL_AUDIO 5 /* audio */ +#define IPL_CLOCK 6 /* clock */ +#define IPL_HIGH 7 /* everything */ /* Interrupt sharing types. */ #define IST_NONE 0 /* none */ @@ -117,8 +118,8 @@ spllower(ncpl) #define splbio() splraise(imask[IPL_BIO]) #define splnet() splraise(imask[IPL_NET]) #define spltty() splraise(imask[IPL_TTY]) +#define splaudio() splraise(imask[IPL_AUDIO]) #define splclock() splraise(imask[IPL_CLOCK]) -#define splimp() splraise(imask[IPL_IMP]) #define splstatclock() splhigh() /* @@ -134,7 +135,8 @@ spllower(ncpl) /* * Miscellaneous */ -#define splhigh() splraise(-1) +#define splimp() splraise(imask[IPL_IMP]) +#define splhigh() splraise(imask[IPL_HIGH]) #define spl0() spllower(0) /* diff --git a/sys/arch/i386/isa/isa_machdep.c b/sys/arch/i386/isa/isa_machdep.c index 79019138dc7..67b908760b8 100644 --- a/sys/arch/i386/isa/isa_machdep.c +++ b/sys/arch/i386/isa/isa_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isa_machdep.c,v 1.33 1998/12/31 09:17:52 deraadt Exp $ */ +/* $OpenBSD: isa_machdep.c,v 1.34 1999/07/23 13:18:04 niklas Exp $ */ /* $NetBSD: isa_machdep.c,v 1.22 1997/06/12 23:57:32 thorpej Exp $ */ #define ISA_DMA_STATS @@ -325,6 +325,7 @@ intr_calculatemasks() * time, so imp > (tty | net | bio). */ imask[IPL_IMP] |= imask[IPL_TTY] | imask[IPL_NET] | imask[IPL_BIO]; + imask[IPL_AUDIO] |= imask[IPL_IMP]; /* * Enforce a hierarchy that gives slow devices a better chance at not diff --git a/sys/dev/audio_if.h b/sys/dev/audio_if.h index 534c63f7bb5..7d82a7cc252 100644 --- a/sys/dev/audio_if.h +++ b/sys/dev/audio_if.h @@ -1,4 +1,4 @@ -/* $OpenBSD: audio_if.h,v 1.8 1999/01/02 00:02:39 niklas Exp $ */ +/* $OpenBSD: audio_if.h,v 1.9 1999/07/23 13:18:04 niklas Exp $ */ /* $NetBSD: audio_if.h,v 1.24 1998/01/10 14:07:25 tv Exp $ */ /* @@ -153,10 +153,10 @@ int audioprint __P((void *, const char *)); #define ISDEVAUDIOCTL(x) (AUDIODEV((x)) == AUDIOCTL_DEVICE) #define ISDEVMIXER(x) (AUDIODEV((x)) == MIXER_DEVICE) -/*#ifndef __i386__*/ +#ifndef __i386__ #define splaudio splbio /* XXX */ #define IPL_AUDIO IPL_BIO /* XXX */ -/*#endif*/ +#endif #endif /* _SYS_DEV_AUDIO_IF_H_ */ diff --git a/sys/dev/isa/mpu401.c b/sys/dev/isa/mpu401.c index ad370234bc6..225a7a113a5 100644 --- a/sys/dev/isa/mpu401.c +++ b/sys/dev/isa/mpu401.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpu401.c,v 1.2 1999/07/20 16:36:05 deraadt Exp $ */ +/* $OpenBSD: mpu401.c,v 1.3 1999/07/23 13:18:04 niklas Exp $ */ /* $NetBSD: mpu401.c,v 1.3 1998/11/25 22:17:06 augustss Exp $ */ /* @@ -58,7 +58,9 @@ #include <dev/isa/mpu401var.h> +#ifndef splaudio #define splaudio() splbio() /* XXX found in audio_if.h normally */ +#endif #ifdef AUDIO_DEBUG #define DPRINTF(x) if (mpu401debug) printf x diff --git a/sys/dev/sequencer.c b/sys/dev/sequencer.c index 9f2f9090a3c..2db4eff0eb2 100644 --- a/sys/dev/sequencer.c +++ b/sys/dev/sequencer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sequencer.c,v 1.1 1999/01/02 00:02:38 niklas Exp $ */ +/* $OpenBSD: sequencer.c,v 1.2 1999/07/23 13:18:04 niklas Exp $ */ /* $NetBSD: sequencer.c,v 1.13 1998/11/25 22:17:07 augustss Exp $ */ /* @@ -61,7 +61,9 @@ #include <dev/midivar.h> #include <dev/sequencervar.h> +#ifndef splaudio #define splaudio() splbio() /* XXX found in audio_if.h normally */ +#endif #define ADDTIMEVAL(a, b) ( \ (a)->tv_sec += (b)->tv_sec, \ |