Module Name: src
Committed By: nat
Date: Thu Mar 23 15:50:48 UTC 2017
Modified Files:
src/distrib/sets/lists/base: shl.mi
src/lib/libossaudio: ossaudio.c shlib_version
Log Message:
Calculate GETISPACE/GETOSPACE properly.
Bump version.
Addresses PR kern/51999.
To generate a diff of this commit:
cvs rdiff -u -r1.804 -r1.805 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.32 -r1.33 src/lib/libossaudio/ossaudio.c
cvs rdiff -u -r1.7 -r1.8 src/lib/libossaudio/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.804 src/distrib/sets/lists/base/shl.mi:1.805
--- src/distrib/sets/lists/base/shl.mi:1.804 Sat Mar 11 16:36:01 2017
+++ src/distrib/sets/lists/base/shl.mi Thu Mar 23 15:50:48 2017
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.804 2017/03/11 16:36:01 christos Exp $
+# $NetBSD: shl.mi,v 1.805 2017/03/23 15:50:48 nat Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -417,7 +417,7 @@
./usr/lib/libopenpgpsdk.so.0.9 base-obsolete obsolete
./usr/lib/libossaudio.so base-sys-shlib compatfile
./usr/lib/libossaudio.so.1 base-sys-shlib compatfile
-./usr/lib/libossaudio.so.1.1 base-sys-shlib compatfile
+./usr/lib/libossaudio.so.1.2 base-sys-shlib compatfile
./usr/lib/libp2k.so base-puffs-shlib compatfile,rump
./usr/lib/libp2k.so.2 base-puffs-shlib compatfile,rump
./usr/lib/libp2k.so.2.0 base-puffs-shlib compatfile,rump
Index: src/lib/libossaudio/ossaudio.c
diff -u src/lib/libossaudio/ossaudio.c:1.32 src/lib/libossaudio/ossaudio.c:1.33
--- src/lib/libossaudio/ossaudio.c:1.32 Fri Feb 10 08:52:04 2017
+++ src/lib/libossaudio/ossaudio.c Thu Mar 23 15:50:48 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ossaudio.c,v 1.32 2017/02/10 08:52:04 maya Exp $ */
+/* $NetBSD: ossaudio.c,v 1.33 2017/03/23 15:50:48 nat Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: ossaudio.c,v 1.32 2017/02/10 08:52:04 maya Exp $");
+__RCSID("$NetBSD: ossaudio.c,v 1.33 2017/03/23 15:50:48 nat 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.play.seek
- + tmpinfo.blocksize - 1) / tmpinfo.blocksize;
+ 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;
*(struct audio_buf_info *)argp = bufinfo;
break;
case SNDCTL_DSP_GETISPACE:
@@ -424,11 +424,9 @@ audio_ioctl(int fd, unsigned long com, v
return retval;
setblocksize(fd, &tmpinfo);
bufinfo.fragsize = tmpinfo.blocksize;
- bufinfo.fragments = tmpinfo.hiwat - (tmpinfo.record.seek +
- tmpinfo.blocksize - 1) / tmpinfo.blocksize;
+ bufinfo.fragments = tmpinfo.record.seek / tmpinfo.blocksize;
bufinfo.fragstotal = tmpinfo.hiwat;
- bufinfo.bytes = tmpinfo.hiwat * tmpinfo.blocksize
- - tmpinfo.record.seek;
+ bufinfo.bytes = bufinfo.fragments * tmpinfo.blocksize;
*(struct audio_buf_info *)argp = bufinfo;
break;
case SNDCTL_DSP_NONBLOCK:
Index: src/lib/libossaudio/shlib_version
diff -u src/lib/libossaudio/shlib_version:1.7 src/lib/libossaudio/shlib_version:1.8
--- src/lib/libossaudio/shlib_version:1.7 Sun May 18 10:38:40 2014
+++ src/lib/libossaudio/shlib_version Thu Mar 23 15:50:48 2017
@@ -1,5 +1,5 @@
-# $NetBSD: shlib_version,v 1.7 2014/05/18 10:38:40 nat Exp $
+# $NetBSD: shlib_version,v 1.8 2017/03/23 15:50:48 nat Exp $
# Remember to update distrib/sets/lists/base/shl.* when changing
#
major=1
-minor=1
+minor=2
