From dc185d2298e0079d9c598c9b56cf7d29645454d9 Mon Sep 17 00:00:00 2001 From: "Andrey A. Chernov" Date: Wed, 5 Nov 1997 00:23:26 +0000 Subject: [PATCH] Do not print config details twice (first variant comes from isa) Format config messages properly (with initial snd0: prefix) --- sys/i386/isa/sound/soundcard.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/i386/isa/sound/soundcard.c b/sys/i386/isa/sound/soundcard.c index 37601f0814a0..a653a5385ea3 100644 --- a/sys/i386/isa/sound/soundcard.c +++ b/sys/i386/isa/sound/soundcard.c @@ -542,7 +542,8 @@ conf_printf(char *name, struct address_info * hw_config) if (!trace_init) return; - printf("<%s> ", name); + printf("snd0: <%s> ", name); +#if 0 if (hw_config->io_base != -1 ) printf("at 0x%03x", hw_config->io_base); @@ -554,7 +555,7 @@ conf_printf(char *name, struct address_info * hw_config) if (hw_config->dma2 != -1) printf(",%d", hw_config->dma2); } - +#endif } @@ -564,7 +565,10 @@ conf_printf2(char *name, int base, int irq, int dma, int dma2) if (!trace_init) return; - printf("<%s> at 0x%03x", name, base); + printf("snd0: <%s> ", name); +#if 0 + if (hw_config->io_base != -1 ) + printf("at 0x%03x", hw_config->io_base); if (irq) printf(" irq %d", irq); @@ -574,7 +578,7 @@ conf_printf2(char *name, int base, int irq, int dma, int dma2) if (dma2 != -1) printf(",%d", dma2); } - +#endif }