diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-07-23 13:18:05 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-07-23 13:18:05 +0000 |
| commit | 193275208f104d335682d80b870dd63dacf3c79f (patch) | |
| tree | fa5c0b9188ef36bc8beb0504200ed2f648dec1b0 /sys/dev | |
| parent | f57734e5260a6aa92634a8d4e74c9c4159e0079d (diff) | |
From NetBSD; let i386 run audio at a high IPL
Diffstat (limited to 'sys/dev')
| -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 |
3 files changed, 9 insertions, 5 deletions
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, \ |