Upgrade the sound sources to Amancio Hasty's latest-and-greatest.

This is based on Voxware 3.5, and corresponds to Amancio's `guspnp21'.

Bug reports to Amancio, please!

1 files changed, 118 insertions, 85 deletions

diff --git a/sys/i386/isa/sound/local.h b/sys/i386/isa/sound/local.h
index fe78b4c..8c86bd8 100644
--- a/sys/i386/isa/sound/local.h
+++ b/sys/i386/isa/sound/local.h
@@ -1,138 +1,171 @@
-/* for FreeBSD */
 /*
- * $Id: local.h,v 1.11 1994/11/01 17:26:50 ache Exp
+ * local.h
+ *
+ * This file was generated by configure. But then HAND-EDITED. It will
+ * probably disappear in future revisions once the configuration process
+ * will become more like that of standard bsd code.
+ * lr 970714
+ *
  */
 
-#ifdef PC98
-/* If a soundcard uses DMA AUTO mode, DPS_BUFFSIZE must be < 64KB. */
-#define DSP_BUFFSIZE 61440
-#else
-#define DSP_BUFFSIZE 65536
-#endif
-#define SELECTED_SOUND_OPTIONS  0xffffffff
-#define SOUND_CONFIG_DATE "Sun Feb 5 14:38:12 EST 1995"
-#define SOUND_CONFIG_BY "freebsd-hackers"
-#define SOUND_CONFIG_HOST "freefall"
-#define SOUND_CONFIG_DOMAIN "cdrom.com"
+/* build hex2hex /tmp/foo.x trix_boot.h trix_boot */
+
+/*
+ * make everything conditioned on NSND>0 so as to detect errors
+ * because of missing "controller snd0" statement
+ */
+#define ALLOW_BUFFER_MAPPING 1
 
-/* determine if sound code should be compiled */
 #include "snd.h"
 #if NSND > 0
-#define KERNEL_SOUNDCARD
-#endif
+#define CONFIGURE_SOUNDCARD
 
-#define ALLOW_SELECT
-
-/* PSS code does not work */
-#ifndef EXCLUDE_PSS
-#define EXCLUDE_PSS
-#endif
+#define CONFIG_SEQUENCER
 
 #include "gus.h"
-#if NGUS == 0 && !defined(EXCLUDE_GUS)
-#define EXCLUDE_GUS
-#endif
-
-#include "gusxvi.h"
-#if NGUSXVI == 0 && !defined(EXCLUDE_GUS16)
-#define EXCLUDE_GUS16
-#endif
-
-#include "mss.h"
-#if NMSS == 0 && !defined(EXCLUDE_MSS)
-#define EXCLUDE_MSS
+#if NGUS != 0 && !defined(CONFIG_GUS)
+#define CONFIG_GUS
+#define CONFIG_GUSMAX
 #endif
 
 #include "trix.h"
-#if NTRIX == 0 && !defined(EXCLUDE_TRIX)
-#define EXCLUDE_TRIX
+#if NTRIX > 0
+#define INCLUDE_TRIX_BOOT
+#define CONFIG_TRIX	/* can use NTRIX > 0 instead */
+#define CONFIG_YM3812
 #endif
 
-#include "sscape.h"
-#if NSSCAPE == 0 && !defined(EXCLUDE_SSCAPE)
-#define EXCLUDE_SSCAPE
+#if defined(CONFIG_GUSMAX) || ( NTRIX > 0 )
+#define CONFIG_AD1848
 #endif
 
-#if NGUS == 0 && !defined(EXCLUDE_GUSMAX)
-# define EXCLUDE_GUSMAX
-# if defined(EXCLUDE_GUS16) && defined(EXCLUDE_MSS) && !defined(EXCLUDE_AD1848)
-#  define EXCLUDE_AD1848
-# endif
-#else
-# define GUSMAX_MIXER
+#if  defined(CONFIG_SEQUENCER) && (NTRIX == 0)
+#define CONFIG_MIDI
 #endif
 
 #include "sb.h"
-#if NSB == 0 && !defined(EXCLUDE_SB)
-#define EXCLUDE_SB
+#if NSB > 0
+#define CONFIG_SB
+#endif
+
+#include "mss.h"
+#if NMSS != 0
+#define CONFIG_AD1848
+#define CONFIG_MSS
+#undef  CONFIG_CS4232
 #endif
 
 #include "sbxvi.h"
-#if NSBXVI == 0 && !defined(EXCLUDE_SB16)
-#define EXCLUDE_SB16
+#if NSBXVI != 0 && !defined(CONFIG_SB16)
+#define CONFIG_SB16
+#define CONFIG_SBPRO                /*  FIXME: Also needs to be a sep option */
 #endif
 
 #include "sbmidi.h"
-#if NSBMIDI == 0 && !defined(EXCLUDE_SB16MIDI)
-#define EXCLUDE_SB16MIDI
+#if NSBMIDI != 0 && !defined(CONFIG_SB16MIDI)
+#define CONFIG_SB16MIDI
 #endif
 
 #include "awe.h"
-#if NAWE == 0 && !defined(EXCLUDE_AWE32)
-#define EXCLUDE_AWE32
+#if NAWE != 0 && !defined(CONFIG_AWE32)
+#define CONFIG_AWE32
 #endif
 
 #include "pas.h"
-#if NPAS == 0 && !defined(EXCLUDE_PAS)
-#define EXCLUDE_PAS
+#if NPAS != 0 && !defined(CONFIG_PAS)
+#define CONFIG_PAS
 #endif
 
 #include "mpu.h"
-#if NMPU == 0 && !defined(EXCLUDE_MPU401)
-#define EXCLUDE_MPU401
+#if NMPU != 0 && !defined(CONFIG_MPU401)
+#define CONFIG_MPU401
 #endif
-
+ 
 #include "opl.h"
-#if NOPL == 0 && !defined(EXCLUDE_YM3812)
-#define EXCLUDE_YM3812
+#if NOPL != 0 && !defined(CONFIG_YM3812)
+#define CONFIG_YM3812
 #endif
 
-#include "uart.h"
-#if NUART == 0 && !defined(EXCLUDE_UART6850)
-#define EXCLUDE_UART6850
+#include "sscape.h"
+
+#define ALLOW_SELECT
+
+/* #undef  CONFIG_PAS */
+/* #undef  CONFIG_ADLIB */
+/* #define CONFIG_GUS */
+/* #undef  CONFIG_MPU401 */
+#undef  CONFIG_UART6850
+#undef  CONFIG_PSS
+#undef  CONFIG_GUS16
+/* #undef  CONFIG_MSS */
+/* #undef  CONFIG_SSCAPE */
+#undef  CONFIG_MAD16
+/* #undef  CONFIG_CS4232 */
+#undef  CONFIG_MAUI
+#undef  CONFIG_PNP
+/* #undef  CONFIG_SBPRO	*/
+/* #undef  CONFIG_SB16	*/
+#undef  CONFIG_AEDSP16
+#define CONFIG_AUDIO	/* obvious ? */
+
+#define CONFIG_MPU_EMU
+
+#define DSP_BUFFSIZE 32768*2
+/* #define SELECTED_SOUND_OPTIONS	0x0188090a */
+
+#ifndef TRIX_SB_BASE
+#define TRIX_SB_BASE 0x220
+#endif
+
+#ifndef TRIX_SB_IRQ
+#define TRIX_SB_IRQ 7
 #endif
 
-#ifdef PC98
-#include "pcm.h"
-#if NPCM == 0 && !defined(EXCLUDE_PCM86)
-#define EXCLUDE_PCM86
+#ifndef TRIX_SB_DMA
+#define TRIX_SB_DMA 1
 #endif
+
+#ifndef TRIX_BASE
+#define	TRIX_BASE	0x530
 #endif
 
+#ifndef TRIX_IRQ
+#define TRIX_IRQ	9
+#endif
 
-/* nothing but a sequencer (Adlib/OPL) ? */
-#if NGUS == 0 && NSB == 0 && NSBMIDI == 0 && NPAS == 0 && NMPU == 0 && \
-    NUART == 0 && NMSS == 0
-#ifndef EXCLUDE_MIDI
-#define EXCLUDE_MIDI
+#ifndef TRIX_DMA
+#define TRIX_DMA	3
 #endif
-#ifndef EXCLUDE_AUDIO
-#if !defined(PC98) || defined(EXCLUDE_PCM86) && defined(EXCLUDE_MSS)
-#define EXCLUDE_AUDIO
+
+#ifndef TRIX_DMA2
+#define TRIX_DMA2	1
 #endif
+
+#ifndef GUS_BASE
+#define GUS_BASE	0x220
 #endif
+
+#ifndef GUS_IRQ
+#define GUS_IRQ		12
 #endif
 
-/* nothing but a Midi (MPU/UART) ? */
-#if NGUS == 0 && NSB == 0 && NSBMIDI == 0 && NPAS == 0 && NOPL == 0 && \
-    NMSS == 0
-/* MPU depends on sequencer timer */
-#if NMPU == 0 && !defined(EXCLUDE_SEQUENCER)
-#define EXCLUDE_SEQUENCER
+#ifndef GUS_MIDI_IRQ
+#define GUS_MIDI_IRQ	GUS_IRQ
 #endif
-#ifndef EXCLUDE_AUDIO
-#if !defined(PC98) || defined(EXCLUDE_PCM86) && defined(EXCLUDE_MSS)
-#define EXCLUDE_AUDIO
+
+#ifndef GUS_DMA
+#define GUS_DMA		4
 #endif
+
+#ifndef GUS_DMA2
+#define GUS_DMA2	4
 #endif
+
+#define SOUND_CONFIG_DATE "Wed Aug  6 22:58:35 PDT 1997"
+#define SOUND_CONFIG_BY "Amancio Hasty"
+#define SOUND_CONFIG_HOST "rah"
+#define SOUND_CONFIG_DOMAIN "star-gate.com"
+
+#else	/* NSND = 0 */
+#undef CONFIGURE_SOUNDCARD
 #endif