[src/trunk]: src/sys/dev Use pustream params when clearing the next block in ...

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

details:   https://anonhg.NetBSD.org/src/rev/9b555d6e4b74
branches:  trunk
changeset: 824973:9b555d6e4b74
user:      nat <nat%NetBSD.org@localhost>
date:      Sun Jun 25 02:11:40 2017 +0000

description:
Use pustream params when clearing the next block in the mixring.

diffstat:

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

diffs (42 lines):

diff -r 04958651e481 -r 9b555d6e4b74 sys/dev/audio.c
--- a/sys/dev/audio.c   Sun Jun 25 02:09:47 2017 +0000
+++ b/sys/dev/audio.c   Sun Jun 25 02:11:40 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: audio.c,v 1.362 2017/06/21 08:40:05 nat Exp $  */
+/*     $NetBSD: audio.c,v 1.363 2017/06/25 02:11:40 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.362 2017/06/21 08:40:05 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.363 2017/06/25 02:11:40 nat Exp $");
 
 #ifdef _KERNEL_OPT
 #include "audio.h"
@@ -3874,7 +3874,7 @@
        cc = blksize - (inp - cb->s.start) % blksize;
        if (sc->sc_writeme == false) {
                DPRINTFN(3, ("MIX RING EMPTY - INSERT SILENCE\n"));
-               audio_fill_silence(&vc->sc_mpr.s.param, inp, cc);
+               audio_fill_silence(&vc->sc_pustream->param, inp, cc);
                sc->sc_pr.drops += cc;
        } else
                cc = blksize;
@@ -3882,11 +3882,11 @@
        cc = blksize;
        cc1 = sc->sc_pr.s.end - sc->sc_pr.s.inp;
        if (cc1 < cc) {
-               audio_fill_silence(&vc->sc_mpr.s.param, sc->sc_pr.s.inp, cc1);
+               audio_fill_silence(&vc->sc_pustream->param, sc->sc_pr.s.inp, cc1);
                cc -= cc1;
-               audio_fill_silence(&vc->sc_mpr.s.param, sc->sc_pr.s.start, cc);
+               audio_fill_silence(&vc->sc_pustream->param, sc->sc_pr.s.start, cc);
        } else
-               audio_fill_silence(&vc->sc_mpr.s.param, sc->sc_pr.s.inp, cc);
+               audio_fill_silence(&vc->sc_pustream->param, sc->sc_pr.s.inp, cc);
        mutex_exit(sc->sc_intr_lock);
 
        kpreempt_disable();