Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make SNDCTL_DSP_POST a nop. It's explicitly *not* supposed to sleep, and as 

it's merely advisory (and in fact is implemented as a nop in the OSS->ALSA
shim), it should be safe to ignore it.
This commit is contained in:
mycroft 2001-12-24 00:10:46 +00:00
parent a89c5fcfcb
commit cbfac6596e
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libossaudio/ossaudio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ossaudio.c,v 1.15 2001/07/08 22:30:15 kim Exp $ */
/* $NetBSD: ossaudio.c,v 1.16 2001/12/24 00:10:46 mycroft Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -100,11 +100,13 @@ audio_ioctl(int fd, unsigned long com, void *argp)
return retval;
break;
case SNDCTL_DSP_SYNC:
case SNDCTL_DSP_POST:
retval = ioctl(fd, AUDIO_DRAIN, 0);
if (retval < 0)
return retval;
break;
case SNDCTL_DSP_POST:
/* This call is merely advisory, and may be a nop. */
break;
case SNDCTL_DSP_SPEED:
AUDIO_INITINFO(&tmpinfo);
tmpinfo.play.sample_rate =

8
sys/compat/ossaudio/ossaudio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ossaudio.c,v 1.38 2001/11/13 02:09:17 lukem Exp $ */
/* $NetBSD: ossaudio.c,v 1.39 2001/12/24 00:10:49 mycroft Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ossaudio.c,v 1.38 2001/11/13 02:09:17 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: ossaudio.c,v 1.39 2001/12/24 00:10:49 mycroft Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@ -118,11 +118,13 @@ oss_ioctl_audio(p, uap, retval)
goto out;
break;
case OSS_SNDCTL_DSP_SYNC:
case OSS_SNDCTL_DSP_POST:
error = ioctlf(fp, AUDIO_DRAIN, (caddr_t)0, p);
if (error)
goto out;
break;
case OSS_SNDCTL_DSP_POST:
/* This call is merely advisory, and may be a nop. */
break;
case OSS_SNDCTL_DSP_SPEED:
AUDIO_INITINFO(&tmpinfo);
error = copyin(SCARG(uap, data), &idat, sizeof idat);