Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev Audio passes the atf test again.



details:   https://anonhg.NetBSD.org/src/rev/96a1bf5122d4
branches:  trunk
changeset: 822052:96a1bf5122d4
user:      nat <nat%NetBSD.org@localhost>
date:      Mon Feb 27 10:31:02 2017 +0000

description:
Audio passes the atf test again.

diffstat:

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

diffs (36 lines):

diff -r fd0bae3432b2 -r 96a1bf5122d4 sys/dev/audio.c
--- a/sys/dev/audio.c   Mon Feb 27 09:27:27 2017 +0000
+++ b/sys/dev/audio.c   Mon Feb 27 10:31:02 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: audio.c,v 1.312 2017/02/26 16:22:55 riastradh Exp $    */
+/*     $NetBSD: audio.c,v 1.313 2017/02/27 10:31:02 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.312 2017/02/26 16:22:55 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.313 2017/02/27 10:31:02 nat Exp $");
 
 #include "audio.h"
 #if NAUDIO > 0
@@ -3431,14 +3431,13 @@
        vc->sc_pbus = true;
        if (sc->sc_trigger_started == false) {
                audio_mix(sc);
-
+               audio_mix(sc);
+               mutex_enter(sc->sc_intr_lock);
+               mix_write(sc);
                vc = chan->vc;
                vc->sc_mpr.s.outp =
                    audio_stream_add_outp(&vc->sc_mpr.s,
                      vc->sc_mpr.s.outp, vc->sc_mpr.blksize);
-               audio_mix(sc);
-               mutex_enter(sc->sc_intr_lock);
-               mix_write(sc);
                mix_write(sc);
                cv_broadcast(&sc->sc_condvar);
                mutex_exit(sc->sc_intr_lock);



Home | Main Index | Thread Index | Old Index