From 0c83bb499c9d80d3e88fe72293af2b23a4f7489d Mon Sep 17 00:00:00 2001 From: Bill Paul Date: Sun, 7 Jan 1996 08:12:13 +0000 Subject: [PATCH] Add NMSS to the list of things that local.h checks for when decding whether of not to automatically #define EXCLUDE_AUDIO; MSS is a real audio device and we should not #define EXCLUDE_AUDIO if we have one. (And I want it because it's the only mixer-capable audio driver that I can use with my crummy Packard Bell (nee Aztech) audio board.) This fixes the very confusing condition where having all of this: mss0 at 0x530 irq 10 drq 1 on isa gus0: opl0 at 0x388 on isa opl0: mpu0 at 0x300 irq 9 drq 0 on isa mpu0: will still give you this: % cat /dev/sndstat SoundCard Error: The soundcard system has not been configured Also remove an unnecessary newline in the printf() message for the 'gus0' device shown above so that we don't wind up printing a blank line between mss0 and gus0. --- sys/i386/isa/sound/ad1848.c | 2 +- sys/i386/isa/sound/local.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/i386/isa/sound/ad1848.c b/sys/i386/isa/sound/ad1848.c index 59ec7f923cd5..077d612c5cb8 100644 --- a/sys/i386/isa/sound/ad1848.c +++ b/sys/i386/isa/sound/ad1848.c @@ -1192,7 +1192,7 @@ ad1848_init (char *name, int io_base, int irq, int dma_playback, int dma_capture "Generic audio codec (%s)", devc->chip_name); #if defined(__FreeBSD__) - printk ("\ngus0: <%s>", ad1848_pcm_operations[nr_ad1848_devs].name); + printk ("gus0: <%s>", ad1848_pcm_operations[nr_ad1848_devs].name); #else printk (" <%s>", ad1848_pcm_operations[nr_ad1848_devs].name); #endif diff --git a/sys/i386/isa/sound/local.h b/sys/i386/isa/sound/local.h index 23d09dd35b08..4cf2b46f7b9e 100644 --- a/sys/i386/isa/sound/local.h +++ b/sys/i386/isa/sound/local.h @@ -94,7 +94,7 @@ /* nothing but a sequencer (Adlib/OPL) ? */ #if NGUS == 0 && NSB == 0 && NSBMIDI == 0 && NPAS == 0 && NMPU == 0 && \ - NUART == 0 + NUART == 0 && NMSS == 0 #ifndef EXCLUDE_MIDI #define EXCLUDE_MIDI #endif @@ -104,7 +104,8 @@ #endif /* nothing but a Midi (MPU/UART) ? */ -#if NGUS == 0 && NSB == 0 && NSBMIDI == 0 && NPAS == 0 && NOPL == 0 +#if NGUS == 0 && NSB == 0 && NSBMIDI == 0 && NPAS == 0 && NOPL == 0 && \ + NMSS == 0 /* MPU depends on sequencer timer */ #if NMPU == 0 && !defined(EXCLUDE_SEQUENCER) #define EXCLUDE_SEQUENCER