Module Name: src
Committed By: nat
Date: Thu Nov 2 02:08:02 UTC 2017
Modified Files:
src/sys/dev: audio.c
Log Message:
Revert commit rev 1.419 to audio.c. This should address PR kern/52685.
This also means that drivers that have a static block size will have more
latency at lower sample rates/precision/channels. Also audio drivers that
do more than supply rounded blocksizes in their round_blocksize functions
will have to be changed.
To generate a diff of this commit:
cvs rdiff -u -r1.421 -r1.422 src/sys/dev/audio.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/dev/audio.c
diff -u src/sys/dev/audio.c:1.421 src/sys/dev/audio.c:1.422
--- src/sys/dev/audio.c:1.421 Tue Oct 31 21:18:02 2017
+++ src/sys/dev/audio.c Thu Nov 2 02:08:02 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.421 2017/10/31 21:18:02 nat Exp $ */
+/* $NetBSD: audio.c,v 1.422 2017/11/02 02:08:02 nat Exp $ */
/*-
* Copyright (c) 2016 Nathanial Sloss <nathanialsl...@yahoo.com.au>
@@ -148,7 +148,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.421 2017/10/31 21:18:02 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.422 2017/11/02 02:08:02 nat Exp $");
#ifdef _KERNEL_OPT
#include "audio.h"
@@ -2005,21 +2005,9 @@ audio_init_ringbuffer(struct audio_softc
blksize = rp->s.bufsize / AUMINNOBLK;
ROUNDSIZE(blksize);
DPRINTF(("audio_init_ringbuffer: MI blksize=%d\n", blksize));
-
- struct virtual_channel *hwvc = sc->sc_hwvc;
- if (sc->hw_if->round_blocksize &&
- (rp == &hwvc->sc_mpr || rp == &hwvc->sc_mrr)) {
+ if (sc->hw_if->round_blocksize)
blksize = sc->hw_if->round_blocksize(sc->hw_hdl, blksize,
- mode, &rp->s.param);
- } else {
- int tmpblksize = 1;
- /* round blocksize to a power of 2 */
- while (tmpblksize < blksize)
- tmpblksize <<= 1;
-
- blksize = tmpblksize;
- }
-
+ mode, &rp->s.param);
if (blksize <= 0)
panic("audio_init_ringbuffer: blksize=%d", blksize);
nblks = rp->s.bufsize / blksize;
