diff options
| -rw-r--r-- | sys/conf/NOTES | 7 | ||||
| -rw-r--r-- | sys/conf/options.i386 | 6 | ||||
| -rw-r--r-- | sys/i386/conf/LINT | 7 | ||||
| -rw-r--r-- | sys/i386/conf/NOTES | 7 | ||||
| -rw-r--r-- | sys/i386/conf/options.i386 | 6 | ||||
| -rw-r--r-- | sys/i386/isa/sound/local.h | 3 |
6 files changed, 31 insertions, 5 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 0ee9048..66497e1 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.442 1998/06/30 08:01:28 jmg Exp $ +# $Id: LINT,v 1.443 1998/06/30 08:13:26 jmg Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -1114,6 +1114,11 @@ options NATM #native ATM # PAS16: The order of the pas0/sb0/opl0 is important since the # sb emulation is enabled in the pas-16 attach. # +# To overide the GUS defaults use: +# options GUS_DMA2 +# options GUS_DMA +# options GUS_IRQ +# # The i386/isa/sound/sound.doc has more information. # Controls all "VOXWARE" driver sound devices. See Luigi's driver diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index 881b97a..7141991 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -1,4 +1,4 @@ -# $Id: options.i386,v 1.77 1998/04/18 04:58:01 ahasty Exp $ +# $Id: options.i386,v 1.78 1998/05/11 02:13:33 dyson Exp $ BOUNCEPAGES opt_bounce.h DISABLE_PSE @@ -124,3 +124,7 @@ PCVT_VT220KEYB opt_pcvt.h # give bktr an opt_bktr.h file OVERRIDE_TUNER opt_bktr.h +# voxware options +GUS_DMA2 opt_sound.h +GUS_DMA opt_sound.h +GUS_IRQ opt_sound.h diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index 0ee9048..66497e1 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.442 1998/06/30 08:01:28 jmg Exp $ +# $Id: LINT,v 1.443 1998/06/30 08:13:26 jmg Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -1114,6 +1114,11 @@ options NATM #native ATM # PAS16: The order of the pas0/sb0/opl0 is important since the # sb emulation is enabled in the pas-16 attach. # +# To overide the GUS defaults use: +# options GUS_DMA2 +# options GUS_DMA +# options GUS_IRQ +# # The i386/isa/sound/sound.doc has more information. # Controls all "VOXWARE" driver sound devices. See Luigi's driver diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 0ee9048..66497e1 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.442 1998/06/30 08:01:28 jmg Exp $ +# $Id: LINT,v 1.443 1998/06/30 08:13:26 jmg Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -1114,6 +1114,11 @@ options NATM #native ATM # PAS16: The order of the pas0/sb0/opl0 is important since the # sb emulation is enabled in the pas-16 attach. # +# To overide the GUS defaults use: +# options GUS_DMA2 +# options GUS_DMA +# options GUS_IRQ +# # The i386/isa/sound/sound.doc has more information. # Controls all "VOXWARE" driver sound devices. See Luigi's driver diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386 index 881b97a..7141991 100644 --- a/sys/i386/conf/options.i386 +++ b/sys/i386/conf/options.i386 @@ -1,4 +1,4 @@ -# $Id: options.i386,v 1.77 1998/04/18 04:58:01 ahasty Exp $ +# $Id: options.i386,v 1.78 1998/05/11 02:13:33 dyson Exp $ BOUNCEPAGES opt_bounce.h DISABLE_PSE @@ -124,3 +124,7 @@ PCVT_VT220KEYB opt_pcvt.h # give bktr an opt_bktr.h file OVERRIDE_TUNER opt_bktr.h +# voxware options +GUS_DMA2 opt_sound.h +GUS_DMA opt_sound.h +GUS_IRQ opt_sound.h diff --git a/sys/i386/isa/sound/local.h b/sys/i386/isa/sound/local.h index c6ed9b8..3f02968 100644 --- a/sys/i386/isa/sound/local.h +++ b/sys/i386/isa/sound/local.h @@ -18,6 +18,9 @@ #include "snd.h" #if NSND > 0 + +#include "opt_sound.h" + #define CONFIGURE_SOUNDCARD #define CONFIG_SEQUENCER |
