diff options
| author | ache <ache@FreeBSD.org> | 1993-11-28 10:55:59 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 1993-11-28 10:55:59 +0000 |
| commit | e431e009b6a86f250122caff1005da3ca2ab5173 (patch) | |
| tree | 4c892d37447f251cc78adbcaf65734abee87eb0e | |
| parent | 1b23af429b7543685abb9ca7dab6605819353d17 (diff) | |
| download | FreeBSD-src-e431e009b6a86f250122caff1005da3ca2ab5173.zip FreeBSD-src-e431e009b6a86f250122caff1005da3ca2ab5173.tar.gz | |
Direct #undefs removed to allow flexible manipulation
via config options. Unneded #defines removed.
Improved dependance of "snd.h" and NSND.
| -rw-r--r-- | sys/i386/isa/sound/local.h | 19 | ||||
| -rw-r--r-- | sys/i386/isa/sound/os.h | 9 | ||||
| -rw-r--r-- | 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 38d4c78..f81bd78 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 04e21ab..60fb96c 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 395e5f1..9cbd810 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 **/ |
