Module Name: src
Committed By: nat
Date: Sat Dec 16 15:58:56 UTC 2017
Modified Files:
src/sys/dev: audio.c
Log Message:
Allow the hwvc block size to be set to any amount with audio mixing
disabled.
To generate a diff of this commit:
cvs rdiff -u -r1.443 -r1.444 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.443 src/sys/dev/audio.c:1.444
--- src/sys/dev/audio.c:1.443 Sat Dec 16 15:56:00 2017
+++ src/sys/dev/audio.c Sat Dec 16 15:58:56 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.443 2017/12/16 15:56:00 nat Exp $ */
+/* $NetBSD: audio.c,v 1.444 2017/12/16 15:58:56 nat Exp $ */
/*-
* Copyright (c) 2016 Nathanial Sloss <[email protected]>
@@ -148,7 +148,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.443 2017/12/16 15:56:00 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.444 2017/12/16 15:58:56 nat Exp $");
#ifdef _KERNEL_OPT
#include "audio.h"
@@ -2725,12 +2725,13 @@ audio_setblksize(struct audio_softc *sc,
stream = vc->sc_pustream;
}
- if (vc == sc->sc_hwvc) {
+ if (sc->sc_usemixer && vc == sc->sc_hwvc) {
mixcb->blksize = audio_calc_blksize(sc, parm);
cb->blksize = audio_calc_blksize(sc, &cb->s.param);
} else {
cb->blksize = audio_calc_blksize(sc, &stream->param);
- if (SPECIFIED(blksize) && blksize > cb->blksize)
+ if ((!sc->sc_usemixer && SPECIFIED(blksize)) ||
+ (SPECIFIED(blksize) && blksize > cb->blksize))
cb->blksize = blksize;
}
}
