CVS commit: src/sys/dev

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Fri Apr 28 06:59:49 UTC 2017

Modified Files:
        src/sys/dev: audio.c

Log Message:
Make "options AUDIO_DEBUG=0" create a silent-by-default version of the
debug output, toggled at runtime by setting audiodebug to a higher value.
To get boot time debugging, use "options AUDIO_DEBUG=1".


To generate a diff of this commit:
cvs rdiff -u -r1.328 -r1.329 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.328 src/sys/dev/audio.c:1.329
--- src/sys/dev/audio.c:1.328	Wed Apr 26 11:32:04 2017
+++ src/sys/dev/audio.c	Fri Apr 28 06:59:49 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: audio.c,v 1.328 2017/04/26 11:32:04 nat Exp $	*/
+/*	$NetBSD: audio.c,v 1.329 2017/04/28 06:59:49 martin 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.328 2017/04/26 11:32:04 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.329 2017/04/28 06:59:49 martin Exp $");
 
 #include "audio.h"
 #if NAUDIO > 0
@@ -1284,14 +1284,16 @@ audio_setup_pfilters(struct audio_softc 
 	}
 
 #ifdef AUDIO_DEBUG
-	printf("%s: HW-buffer=%p pustream=%p\n",
-	       __func__, &vc->sc_mpr.s, vc->sc_pustream);
-	for (i = 0; i < pfilters->req_size; i++) {
-		char num[100];
-		snprintf(num, 100, "[%d]", i);
-		audio_print_params(num, &vc->sc_pstreams[i].param);
+	if (audiodebug) {
+		printf("%s: HW-buffer=%p pustream=%p\n",
+		       __func__, &vc->sc_mpr.s, vc->sc_pustream);
+		for (i = 0; i < pfilters->req_size; i++) {
+			char num[100];
+			snprintf(num, 100, "[%d]", i);
+			audio_print_params(num, &vc->sc_pstreams[i].param);
+		}
+		audio_print_params("[HW]", &vc->sc_mpr.s.param);
 	}
-	audio_print_params("[HW]", &vc->sc_mpr.s.param);
 #endif /* AUDIO_DEBUG */
 
 	return 0;
@@ -1363,13 +1365,15 @@ audio_setup_rfilters(struct audio_softc 
 	HW_UNLOCK(vc);
 
 #ifdef AUDIO_DEBUG
-	printf("%s: HW-buffer=%p pustream=%p\n",
-	       __func__, &vc->sc_mrr.s, vc->sc_rustream);
-	audio_print_params("[HW]", &vc->sc_mrr.s.param);
-	for (i = 0; i < rfilters->req_size; i++) {
-		char num[100];
-		snprintf(num, 100, "[%d]", i);
-		audio_print_params(num, &vc->sc_rstreams[i].param);
+	if (audiodebug) {
+		printf("%s: HW-buffer=%p pustream=%p\n",
+		       __func__, &vc->sc_mrr.s, vc->sc_rustream);
+		audio_print_params("[HW]", &vc->sc_mrr.s.param);
+		for (i = 0; i < rfilters->req_size; i++) {
+			char num[100];
+			snprintf(num, 100, "[%d]", i);
+			audio_print_params(num, &vc->sc_rstreams[i].param);
+		}
 	}
 #endif /* AUDIO_DEBUG */