From b81db928c3e331c8549048a66df93d57ece24925 Mon Sep 17 00:00:00 2001
From: "Andrey A. Chernov" <ache@FreeBSD.org>
Date: Sun, 28 Nov 1993 10:55:59 +0000
Subject: [PATCH] Direct #undefs removed to allow flexible manipulation via
 config options. Unneded #defines removed. Improved dependance of "snd.h" and
 NSND.

---
 sys/i386/isa/sound/local.h        | 19 ++++++-------------
 sys/i386/isa/sound/os.h           |  9 ---------
 sys/i386/isa/sound/sound_config.h | 18 ++++++++----------
 3 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/sys/i386/isa/sound/local.h b/sys/i386/isa/sound/local.h
index 38d4c789d065..f81bd7821673 100644
--- a/sys/i386/isa/sound/local.h
+++ b/sys/i386/isa/sound/local.h
@@ -1,17 +1,10 @@
-/*	Generated by configure. Don't edit!!!!	*/
+/* These few lines are used by FreeBSD (only??). */
 
-#define KERNEL_SOUNDCARD
-#undef  EXCLUDE_PAS
-#undef  EXCLUDE_SB
-#undef  EXCLUDE_ADLIB
-#undef  EXCLUDE_GUS
-#undef	EXCLUDE_MPU401
-#undef  EXCLUDE_SBPRO
-#undef  EXCLUDE_AUDIO
-#undef  EXCLUDE_MIDI
-#undef  EXCLUDE_YM3812
-#undef  EXCLUDE_SEQUENCER
-#undef  EXCLUDE_CHIP_MIDI
+#include "snd.h"
+
+#if NSND > 0
+#define CONFIGURE_SOUNDCARD
+#endif
 
 #define DSP_BUFFSIZE 32768
 #define SELECTED_SOUND_OPTIONS	0xffffffff
diff --git a/sys/i386/isa/sound/os.h b/sys/i386/isa/sound/os.h
index 04e21ab0f74d..60fb96c24aa4 100644
--- a/sys/i386/isa/sound/os.h
+++ b/sys/i386/isa/sound/os.h
@@ -58,15 +58,6 @@
 #include "buf.h"
 #include "i386/isa/isa_device.h"
 
-/* These few lines are used by FreeBSD (only??). */
-
-#if NSND > 0
-#define KERNEL_SOUNDCARD
-#else
-#undef KERNEL_SOUNDCARD
-#endif
-
-
 /*
  * Rest of the file is compiled only if the driver is really required.
  */
diff --git a/sys/i386/isa/sound/sound_config.h b/sys/i386/isa/sound/sound_config.h
index 395e5f105ccd..9cbd8103b8f5 100644
--- a/sys/i386/isa/sound/sound_config.h
+++ b/sys/i386/isa/sound/sound_config.h
@@ -30,27 +30,25 @@
 
 #include "local.h"
 
-
-#undef CONFIGURE_SOUNDCARD
-#undef DYNAMIC_BUFFER
-
-#ifdef KERNEL_SOUNDCARD
-#define CONFIGURE_SOUNDCARD
-#define DYNAMIC_BUFFER
-#undef LOADABLE_SOUNDCARD
-#endif
-
 #ifdef EXCLUDE_SEQUENCER
+#ifndef EXCLUDE_MIDI
 #define EXCLUDE_MIDI
+#endif
+#ifndef EXCLUDE_YM3812
 #define EXCLUDE_YM3812
+#endif
+#ifndef EXCLUDE_OPL3
 #define EXCLUDE_OPL3
 #endif
+#endif
 
 /** UWM - new MIDI stuff **/
 
 #ifdef EXCLUDE_CHIP_MIDI
+#ifndef EXCLUDE_PRO_MIDI
 #define EXCLUDE_PRO_MIDI
 #endif
+#endif
 
 /** UWM - stuff **/