Module Name: src Committed By: nat Date: Tue May 2 06:37:12 UTC 2017
Modified Files: src/sys/dev: audio.c Log Message: More debuging output - if mix or hw ring inserts silence. This is to help identify the cause of PR kern/52175. To generate a diff of this commit: cvs rdiff -u -r1.330 -r1.331 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.330 src/sys/dev/audio.c:1.331 --- src/sys/dev/audio.c:1.330 Tue May 2 06:25:05 2017 +++ src/sys/dev/audio.c Tue May 2 06:37:11 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: audio.c,v 1.330 2017/05/02 06:25:05 nat Exp $ */ +/* $NetBSD: audio.c,v 1.331 2017/05/02 06:37:11 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.330 2017/05/02 06:25:05 nat Exp $"); +__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.331 2017/05/02 06:37:11 nat Exp $"); #include "audio.h" #if NAUDIO > 0 @@ -3616,6 +3616,7 @@ audio_pint(void *v) vc->sc_mpr.s.outp, blksize); if (audio_stream_get_used(&sc->sc_pr.s) < blksize) { + DPRINTFN(3, ("HW RING - INSERT SILENCE\n")); used = blksize; while (used > 0) { cc = sc->sc_pr.s.end - sc->sc_pr.s.inp; @@ -3805,9 +3806,10 @@ audio_mix(void *v) cb = &sc->sc_pr; inp = cb->s.inp; cc = blksize - (inp - cb->s.start) % blksize; - if (sc->sc_writeme == false) + if (sc->sc_writeme == false) { + DPRINTFN(3, ("MIX RING EMPTY - INSERT SILENCE\n")); audio_fill_silence(&vc->sc_mpr.s.param, inp, cc); - else + } else cc = blksize; cb->s.inp = audio_stream_add_inp(&cb->s, cb->s.inp, cc); mutex_exit(sc->sc_intr_lock);