[src/trunk]: src/sys/arch/arm/iomd Control debugging with VIDCAUDIO_DEBUG rat...

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

details:   https://anonhg.NetBSD.org/src/rev/2644ea853ce7
branches:  trunk
changeset: 556890:2644ea853ce7
user:      bjh21 <bjh21%NetBSD.org@localhost>
date:      Mon Dec 29 16:45:58 2003 +0000

description:
Control debugging with VIDCAUDIO_DEBUG rather that DEBUG, to avoid confusion
with the global kernel macro called DEBUG.

diffstat:

 sys/arch/arm/iomd/vidcaudio.c |  32 +++++++++++++++-----------------
 1 files changed, 15 insertions(+), 17 deletions(-)

diffs (144 lines):

diff -r 2b4908d74eb8 -r 2644ea853ce7 sys/arch/arm/iomd/vidcaudio.c
--- a/sys/arch/arm/iomd/vidcaudio.c     Mon Dec 29 16:41:22 2003 +0000
+++ b/sys/arch/arm/iomd/vidcaudio.c     Mon Dec 29 16:45:58 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vidcaudio.c,v 1.21 2003/12/29 16:41:22 bjh21 Exp $     */
+/*     $NetBSD: vidcaudio.c,v 1.22 2003/12/29 16:45:58 bjh21 Exp $     */
 
 /*
  * Copyright (c) 1995 Melvin Tang-Richardson
@@ -38,7 +38,7 @@
 
 #include <sys/param.h> /* proc.h */
 
-__KERNEL_RCSID(0, "$NetBSD: vidcaudio.c,v 1.21 2003/12/29 16:41:22 bjh21 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vidcaudio.c,v 1.22 2003/12/29 16:45:58 bjh21 Exp $");
 
 #include <sys/audioio.h>
 #include <sys/conf.h>   /* autoconfig functions */
@@ -64,8 +64,6 @@
 
 extern int *vidc_base;
 
-#undef DEBUG
-
 struct audio_general {
        vaddr_t silence;
        irqhandler_t    ih;
@@ -254,7 +252,7 @@
 
        audio_attach_mi(&vidcaudio_hw_if, sc, &sc->device);
 
-#ifdef DEBUG
+#ifdef VIDCAUDIO_DEBUG
        printf(" UNDER DEVELOPMENT (nuts)\n");
 #endif
 }
@@ -264,7 +262,7 @@
 {
        struct vidcaudio_softc *sc = addr;
 
-#ifdef DEBUG
+#ifdef VIDCAUDIO_DEBUG
        printf("DEBUG: vidcaudio_open called\n");
 #endif
 
@@ -284,7 +282,7 @@
 
        vidcaudio_shutdown();
 
-#ifdef DEBUG
+#ifdef VIDCAUDIO_DEBUG
        printf("DEBUG: vidcaudio_close called\n");
 #endif
 
@@ -345,7 +343,7 @@
 
        /* I can only DMA inside 1 page */
 
-#ifdef DEBUG
+#ifdef VIDCAUDIO_DEBUG
        printf("vidcaudio_start_output (%d) %p %p\n", cc, intr, arg);
 #endif
 
@@ -355,7 +353,7 @@
                 * my buffer
                 */
 
-#ifdef DEBUG
+#ifdef VIDCAUDIO_DEBUG
                printf("vidcaudio: DMA over page boundary requested."
                    "  Fixing up\n");
 #endif
@@ -392,7 +390,7 @@
 vidcaudio_halt_output(void *addr)
 {
 
-#ifdef DEBUG
+#ifdef VIDCAUDIO_DEBUG
        printf("DEBUG: vidcaudio_halt_output\n");
 #endif
        return EIO;
@@ -402,7 +400,7 @@
 vidcaudio_halt_input(void *addr)
 {
 
-#ifdef DEBUG
+#ifdef VIDCAUDIO_DEBUG
        printf("DEBUG: vidcaudio_halt_input\n");
 #endif
        return EIO;
@@ -412,7 +410,7 @@
 vidcaudio_speaker_ctl(void *addr, int newstate)
 {
 
-#ifdef DEBUG
+#ifdef VIDCAUDIO_DEBUG
        printf("DEBUG: vidcaudio_speaker_ctl\n");
 #endif
        return 0;
@@ -458,7 +456,7 @@
 vidcaudio_dummy_routine(void *arg)
 {
 
-#ifdef DEBUG
+#ifdef VIDCAUDIO_DEBUG
        printf("vidcaudio_dummy_routine\n");
 #endif
 }
@@ -532,7 +530,7 @@
 #ifdef PRINT
                printf("vidcaudio: start output\n");
 #endif
-#ifdef DEBUG
+#ifdef VIDCAUDIO_DEBUG
                printf("SE");
 #endif
                enable_irq(sound_dma_intr);
@@ -549,7 +547,7 @@
                        PHYS(end - 16, &ag.next_end);
                        ag.next_intr = intr;
                        ag.next_arg = arg;
-#ifdef DEBUG
+#ifdef VIDCAUDIO_DEBUG
                        printf("s");
 #endif
                }
@@ -596,7 +594,7 @@
 
        /* Have I got the generic audio device attached */
 
-#ifdef DEBUG
+#ifdef VIDCAUDIO_DEBUG
        printf ( "[B%01x]", status );
 #endif
 
@@ -613,7 +611,7 @@
        ag.arg = xarg;
 
        if (nintr) {
-#ifdef DEBUG
+#ifdef VIDCAUDIO_DEBUG
                printf("i");
 #endif
                (*nintr)(narg);