diff options
| author | jkh <jkh@FreeBSD.org> | 1995-07-28 21:40:49 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1995-07-28 21:40:49 +0000 |
| commit | 19112b8b1d7c4013411f77a8ee48332903ec93ab (patch) | |
| tree | 81647a2f70826c19344d26635282f97d889294b9 /sys/i386/isa/sound/local.h | |
| parent | ccee31df86151913015fb2d5accc4c61a4a5f822 (diff) | |
| download | FreeBSD-src-19112b8b1d7c4013411f77a8ee48332903ec93ab.zip FreeBSD-src-19112b8b1d7c4013411f77a8ee48332903ec93ab.tar.gz | |
Update the sound driver to VOXWARE 3.05 with one GUS patch from
Amancio. There is some SoundSource support here that is primitive and
probably doesn't work, but I'll let the two submitters let me know
how my integration of that was since I don't have this card to test.
I've only tested this on my GUS MAX since it's all I have.
This all probably needs to be re-done anyway since we're widely variant
from the original VOXWARE source in the current layout.
Submitted by: Amancio Hasty and Jim Lowe
Obtained from: Hannu Savolainen
Diffstat (limited to 'sys/i386/isa/sound/local.h')
| -rw-r--r-- | sys/i386/isa/sound/local.h | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/sys/i386/isa/sound/local.h b/sys/i386/isa/sound/local.h index 00d7d97..b45b0ac 100644 --- a/sys/i386/isa/sound/local.h +++ b/sys/i386/isa/sound/local.h @@ -5,7 +5,6 @@ #define DSP_BUFFSIZE 65536 #define SELECTED_SOUND_OPTIONS 0xffffffff -#define SOUND_VERSION_STRING "2.90-2" #define SOUND_CONFIG_DATE "Sun Feb 5 14:38:12 EST 1995" #define SOUND_CONFIG_BY "freebsd-hackers" #define SOUND_CONFIG_HOST "freefall" @@ -17,6 +16,8 @@ #define KERNEL_SOUNDCARD #endif +#define ALLOW_SELECT + /* PSS code does not work */ #ifndef EXCLUDE_PSS #define EXCLUDE_PSS @@ -32,9 +33,28 @@ #define EXCLUDE_GUS16 #endif -#include "gusmax.h" -#if NGUSMAX == 0 && !defined(EXCLUDE_GUSMAX) -#define EXCLUDE_GUSMAX +#include "mss.h" +#if NMSS == 0 && !defined(EXCLUDE_MSS) +#define EXCLUDE_MSS +#endif + +#include "trix.h" +#if NTRIX == 0 && !defined(EXCLUDE_TRIX) +#define EXCLUDE_TRIX +#endif + +#include "sscape.h" +#if NSSCAPE == 0 && !defined(EXCLUDE_SSCAPE) +#define EXCLUDE_SSCAPE +#endif + +#if !defined(GUSMAX) && !defined(EXCLUDE_GUSMAX) +# define EXCLUDE_GUSMAX +# if defined(EXCLUDE_GUS16) && defined(EXCLUDE_MSS) && !defined(EXCLUDE_AD1848) +# define EXCLUDE_AD1848 +# endif +#else +# define GUSMAX_MIXER #endif #include <sb.h> @@ -67,11 +87,6 @@ #define EXCLUDE_YM3812 #endif -#include "mss.h" -#if NMSS == 0 && !defined(EXCLUDE_MSS) -#define EXCLUDE_MSS -#endif - #include "uart.h" #if NUART == 0 && !defined(EXCLUDE_UART6850) #define EXCLUDE_UART6850 |
