Module Name: src
Committed By: nat
Date: Fri Mar 24 14:32:29 UTC 2017
Modified Files:
src/sys/compat/ossaudio: ossaudio.c
Log Message:
Update compat/ossaudio with GETISPACE/GETOSPACE corrections from
libossaudio.
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/compat/ossaudio/ossaudio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/ossaudio/ossaudio.c
diff -u src/sys/compat/ossaudio/ossaudio.c:1.69 src/sys/compat/ossaudio/ossaudio.c:1.70
--- src/sys/compat/ossaudio/ossaudio.c:1.69 Fri Sep 5 09:21:55 2014
+++ src/sys/compat/ossaudio/ossaudio.c Fri Mar 24 14:32:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ossaudio.c,v 1.69 2014/09/05 09:21:55 matt Exp $ */
+/* $NetBSD: ossaudio.c,v 1.70 2017/03/24 14:32:29 nat Exp $ */
/*-
* Copyright (c) 1997, 2008 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ossaudio.c,v 1.69 2014/09/05 09:21:55 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ossaudio.c,v 1.70 2017/03/24 14:32:29 nat Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -619,12 +619,11 @@ oss_ioctl_audio(struct lwp *l, const str
}
setblocksize(fp, &tmpinfo);
bufinfo.fragsize = tmpinfo.blocksize;
- bufinfo.fragments = tmpinfo.hiwat -
- (tmpinfo.play.seek + tmpinfo.blocksize - 1) /
+ bufinfo.fragments = (tmpinfo.hiwat * tmpinfo.blocksize -
+ (tmpinfo.play.seek + tmpinfo.blocksize -1)) /
tmpinfo.blocksize;
bufinfo.fragstotal = tmpinfo.hiwat;
- bufinfo.bytes =
- tmpinfo.hiwat * tmpinfo.blocksize - tmpinfo.play.seek;
+ bufinfo.bytes = bufinfo.fragments * tmpinfo.blocksize;
error = copyout(&bufinfo, SCARG(uap, data), sizeof bufinfo);
if (error) {
DPRINTF(("%s: SNDCTL_DSP_GETOSPACE = %d\n",
@@ -641,12 +640,9 @@ oss_ioctl_audio(struct lwp *l, const str
}
setblocksize(fp, &tmpinfo);
bufinfo.fragsize = tmpinfo.blocksize;
- bufinfo.fragments = tmpinfo.hiwat -
- (tmpinfo.record.seek + tmpinfo.blocksize - 1) /
- tmpinfo.blocksize;
- bufinfo.fragstotal = tmpinfo.hiwat;
- bufinfo.bytes =
- tmpinfo.hiwat * tmpinfo.blocksize - tmpinfo.record.seek;
+ bufinfo.fragments = tmpinfo.record.seek / tmpinfo.blocksize;
+ bufinfo.fragstotal = tmpinfo.hiwat;
+ bufinfo.bytes = bufinfo.fragments * tmpinfo.blocksize;
error = copyout(&bufinfo, SCARG(uap, data), sizeof bufinfo);
if (error) {
DPRINTF(("%s: SNDCTL_DSP_GETISPACE %d %d %d %d = %d\n",
