[src/trunk]: src/sys/dev Use mixring blocksizes in the right places when mixe...

[nat <nat%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cca0c8421f09
branches:  trunk
changeset: 357362:cca0c8421f09
user:      nat <nat%NetBSD.org@localhost>
date:      Tue Nov 07 09:26:55 2017 +0000

description:
Use mixring blocksizes in the right places when mixer is enabled.

This means that x68k's vs audio works once again with sysctl usemixer=1.

Tested with xm6i.

diffstat:

 sys/dev/audio.c |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (64 lines):

diff -r 6c42198a5593 -r cca0c8421f09 sys/dev/audio.c
--- a/sys/dev/audio.c   Tue Nov 07 09:17:06 2017 +0000
+++ b/sys/dev/audio.c   Tue Nov 07 09:26:55 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: audio.c,v 1.430 2017/11/07 01:13:19 nat Exp $  */
+/*     $NetBSD: audio.c,v 1.431 2017/11/07 09:26:55 nat Exp $  */
 
 /*-
  * Copyright (c) 2016 Nathanial Sloss <nathanialsloss%yahoo.com.au@localhost>
@@ -148,7 +148,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.430 2017/11/07 01:13:19 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.431 2017/11/07 09:26:55 nat Exp $");
 
 #ifdef _KERNEL_OPT
 #include "audio.h"
@@ -3789,7 +3789,7 @@
        if (sc->sc_dying == true)
                return;
 
-       blksize = sc->sc_hwvc->sc_mpr.blksize;
+       blksize = sc->sc_mixring.sc_mpr.blksize;
        SIMPLEQ_FOREACH(chan, &sc->sc_audiochan, entries) {
                vc = chan->vc;
 
@@ -5552,10 +5552,10 @@
 
        if (sc->sc_usemixer &&
            audio_stream_get_used(vc->sc_pustream) <=
-                               vc->sc_mpr.blksize) {
+                               sc->sc_mixring.sc_mpr.blksize) {
                tocopy = vc->sc_pustream->inp;
                orig = sc->sc_mixring.sc_mpr.s.outp;
-               used = vc->sc_mpr.blksize;
+               used = sc->sc_mixring.sc_mpr.blksize;
 
                while (used > 0) {
                        cc = used;
@@ -5578,12 +5578,12 @@
                }
 
                vc->sc_pustream->inp = audio_stream_add_inp(vc->sc_pustream,
-                   vc->sc_pustream->inp, vc->sc_mpr.blksize);
+                   vc->sc_pustream->inp, sc->sc_mixring.sc_mpr.blksize);
 
                sc->sc_mixring.sc_mpr.s.outp =
                    audio_stream_add_outp(&sc->sc_mixring.sc_mpr.s,
                        sc->sc_mixring.sc_mpr.s.outp,
-                       vc->sc_mpr.blksize);
+                       sc->sc_mixring.sc_mpr.blksize);
        }
 
        if (vc->sc_npfilters > 0) {
@@ -5901,7 +5901,7 @@
                        kthread_exit(0);
                }
 
-               while (sc->sc_trigger_started && sc->sc_usemixer &&
+               while (sc->sc_usemixer &&
                    audio_stream_get_used(&sc->sc_mixring.sc_mpr.s) <
                                                sc->sc_mixring.sc_mpr.blksize) {
                        mutex_exit(sc->sc_intr_lock);