From owner-freebsd-commit Sun Jan 7 00:12:32 1996 Return-Path: owner-commit Received: (from root@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id AAA25380 for freebsd-commit-outgoing; Sun, 7 Jan 1996 00:12:32 -0800 (PST) Received: (from root@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id AAA25347 for cvs-all-outgoing; Sun, 7 Jan 1996 00:12:24 -0800 (PST) Received: (from root@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id AAA25333 for cvs-sys-outgoing; Sun, 7 Jan 1996 00:12:20 -0800 (PST) Received: (from wpaul@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id AAA25317 Sun, 7 Jan 1996 00:12:18 -0800 (PST) Date: Sun, 7 Jan 1996 00:12:18 -0800 (PST) From: Bill Paul Message-Id: <199601070812.AAA25317@freefall.freebsd.org> To: CVS-committers, cvs-sys Subject: cvs commit: src/sys/i386/isa/sound ad1848.c local.h Sender: owner-commit@FreeBSD.ORG Precedence: bulk wpaul 96/01/07 00:12:16 Modified: sys/i386/isa/sound ad1848.c local.h Log: 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. Revision Changes Path 1.10 +1 -1 src/sys/i386/isa/sound/ad1848.c 1.19 +3 -2 src/sys/i386/isa/sound/local.h