Module Name: src Committed By: martin Date: Sat Feb 9 14:43:08 UTC 2019
Modified Files: src/lib/libossaudio [netbsd-8]: ossaudio.c src/sys/compat/ossaudio [netbsd-8]: ossaudio.c Log Message: Pull up following revision(s) (requested by isaki in ticket #1185): lib/libossaudio/ossaudio.c: revision 1.35 sys/compat/ossaudio/ossaudio.c: revision 1.71 Revert a wrong SNDCTL_DSP_GETOSPACE part of rev1.33. - 'fragments' is the number of full free blocks and should not be negative value. - 'bytes' should not be rounded down. It makes mpv work correctly (fixes a second half of kern/53028). Reviewed by mlelstv@ - Revert a wrong OSS_SNDCTL_DSP_GETOSPACE part of rev1.70. - 'fragments' is the number of full free blocks and should not be negative value. - 'bytes' should not be rounded down. To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.33.4.1 src/lib/libossaudio/ossaudio.c cvs rdiff -u -r1.70 -r1.70.6.1 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/lib/libossaudio/ossaudio.c diff -u src/lib/libossaudio/ossaudio.c:1.33 src/lib/libossaudio/ossaudio.c:1.33.4.1 --- src/lib/libossaudio/ossaudio.c:1.33 Thu Mar 23 15:50:48 2017 +++ src/lib/libossaudio/ossaudio.c Sat Feb 9 14:43:07 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ossaudio.c,v 1.33 2017/03/23 15:50:48 nat Exp $ */ +/* $NetBSD: ossaudio.c,v 1.33.4.1 2019/02/09 14:43:07 martin Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__RCSID("$NetBSD: ossaudio.c,v 1.33 2017/03/23 15:50:48 nat Exp $"); +__RCSID("$NetBSD: ossaudio.c,v 1.33.4.1 2019/02/09 14:43:07 martin Exp $"); /* * This is an OSS (Linux) sound API emulator. @@ -411,11 +411,11 @@ audio_ioctl(int fd, unsigned long com, v return retval; setblocksize(fd, &tmpinfo); bufinfo.fragsize = tmpinfo.blocksize; - bufinfo.fragments = (tmpinfo.hiwat * tmpinfo.blocksize - - (tmpinfo.play.seek + tmpinfo.blocksize -1)) / - tmpinfo.blocksize; + bufinfo.fragments = tmpinfo.hiwat - (tmpinfo.play.seek + + tmpinfo.blocksize - 1) / tmpinfo.blocksize; bufinfo.fragstotal = tmpinfo.hiwat; - bufinfo.bytes = bufinfo.fragments * tmpinfo.blocksize; + bufinfo.bytes = tmpinfo.hiwat * tmpinfo.blocksize + - tmpinfo.play.seek; *(struct audio_buf_info *)argp = bufinfo; break; case SNDCTL_DSP_GETISPACE: Index: src/sys/compat/ossaudio/ossaudio.c diff -u src/sys/compat/ossaudio/ossaudio.c:1.70 src/sys/compat/ossaudio/ossaudio.c:1.70.6.1 --- src/sys/compat/ossaudio/ossaudio.c:1.70 Fri Mar 24 14:32:29 2017 +++ src/sys/compat/ossaudio/ossaudio.c Sat Feb 9 14:43:08 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ossaudio.c,v 1.70 2017/03/24 14:32:29 nat Exp $ */ +/* $NetBSD: ossaudio.c,v 1.70.6.1 2019/02/09 14:43:08 martin 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.70 2017/03/24 14:32:29 nat Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ossaudio.c,v 1.70.6.1 2019/02/09 14:43:08 martin Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -619,11 +619,12 @@ oss_ioctl_audio(struct lwp *l, const str } setblocksize(fp, &tmpinfo); bufinfo.fragsize = tmpinfo.blocksize; - bufinfo.fragments = (tmpinfo.hiwat * tmpinfo.blocksize - - (tmpinfo.play.seek + tmpinfo.blocksize -1)) / + bufinfo.fragments = tmpinfo.hiwat - + (tmpinfo.play.seek + tmpinfo.blocksize - 1) / tmpinfo.blocksize; bufinfo.fragstotal = tmpinfo.hiwat; - bufinfo.bytes = bufinfo.fragments * tmpinfo.blocksize; + bufinfo.bytes = + tmpinfo.hiwat * tmpinfo.blocksize - tmpinfo.play.seek; error = copyout(&bufinfo, SCARG(uap, data), sizeof bufinfo); if (error) { DPRINTF(("%s: SNDCTL_DSP_GETOSPACE = %d\n",