patch-1.3.9 linux/drivers/sound/sound_config.h

• Lines: 183
• Date: Wed Jul 5 22:37:12 1995
• Orig file: v1.3.8/linux/drivers/sound/sound_config.h
• Orig date: Fri Aug 19 08:54:10 1994

diff -u --recursive --new-file v1.3.8/linux/drivers/sound/sound_config.h linux/drivers/sound/sound_config.h
@@ -29,6 +29,13 @@
  */
 
 #include "local.h"
+#include "os.h"
+#include "soundvers.h"
+
+#if !defined(PSS_MPU_BASE) && defined(EXCLUDE_SSCAPE) && \
+			      defined(EXCLUDE_TRIX) && !defined(MAD16_MPU_BASE)
+#define EXCLUDE_MPU_EMU
+#endif
 
 #if defined(ISC) || defined(SCO) || defined(SVR42)
 #define GENERIC_SYSV
@@ -38,10 +45,16 @@
  * Disable the AD1848 driver if there are no other drivers requiring it.
  */
 
-#if defined(EXCLUDE_GUS16) && defined(EXCLUDE_MSS) && defined(EXCLUDE_PSS) && defined(EXCLUDE_GUSMAX)
+#if defined(EXCLUDE_GUS16) && defined(EXCLUDE_MSS) && \
+    defined(EXCLUDE_PSS) && defined(EXCLUDE_GUSMAX) && \
+    defined(EXCLUDE_SSCAPE) && defined(EXCLUDE_TRIX) && defined(EXCLUDE_MAD16)
 #define EXCLUDE_AD1848
 #endif
 
+#ifdef PSS_MSS_BASE
+#undef EXCLUDE_AD1848
+#endif
+
 #undef CONFIGURE_SOUNDCARD
 #undef DYNAMIC_BUFFER
 
@@ -63,80 +76,6 @@
 
 #ifdef CONFIGURE_SOUNDCARD
 
-/* ****** IO-address, DMA and IRQ settings ****
-
-If your card has nonstandard I/O address or IRQ number, change defines
-   for the following settings in your kernel Makefile */
-
-#ifndef SBC_BASE
-#define SBC_BASE	0x220	/* 0x220 is the factory default. */
-#endif
-
-#ifndef SBC_IRQ
-#define SBC_IRQ		7	/* IQR7 is the factory default.	 */
-#endif
-
-#ifndef SBC_DMA
-#define SBC_DMA		1
-#endif
-
-#ifndef SB16_DMA
-#define SB16_DMA	6
-#endif
-
-#ifndef SB16MIDI_BASE
-#define SB16MIDI_BASE	0x300
-#endif
-
-#ifndef PAS_BASE
-#define PAS_BASE	0x388
-#endif
-
-#ifndef PAS_IRQ
-#define PAS_IRQ		5
-#endif
-
-#ifndef PAS_DMA
-#define PAS_DMA		3
-#endif
-
-#ifndef GUS_BASE
-#define GUS_BASE	0x220
-#endif
-
-#ifndef GUS_IRQ
-#define GUS_IRQ		15
-#endif
-
-#ifndef GUS_MIDI_IRQ
-#define GUS_MIDI_IRQ	GUS_IRQ
-#endif
-
-#ifndef GUS_DMA
-#define GUS_DMA		6
-#endif
-
-#ifndef MPU_BASE
-#define MPU_BASE	0x330
-#endif
-
-#ifndef MPU_IRQ
-#define MPU_IRQ		6
-#endif
-
-/* Echo Personal Sound System */
-#ifndef PSS_BASE
-#define PSS_BASE        0x220   /* 0x240 or */
-#endif
-
-#ifndef PSS_IRQ
-#define PSS_IRQ         7
-#endif
-
-#ifndef PSS_DMA
-#define PSS_DMA         1
-#endif
-
 #ifndef MAX_REALTIME_FACTOR
 #define MAX_REALTIME_FACTOR	4
 #endif
@@ -190,7 +129,7 @@
 #define SND_DEV_DSP16	5	/* Like /dev/dsp but 16 bits/sample */
 #define SND_DEV_STATUS	6	/* /dev/sndstat */
 /* #7 not in use now. Was in 2.4. Free for use after v3.0. */
-#define SND_DEV_SEQ2	8	/* /dev/sequencer, level 2 interface */
+#define SND_DEV_SEQ2	8	/* /dev/sequecer, level 2 interface */
 #define SND_DEV_SNDPROC 9	/* /dev/sndproc for programmable devices */
 #define SND_DEV_PSS	SND_DEV_SNDPROC
 
@@ -200,19 +139,21 @@
 #define OFF		0
 
 #define MAX_AUDIO_DEV	5
-#define MAX_MIXER_DEV	2
+#define MAX_MIXER_DEV	5
 #define MAX_SYNTH_DEV	3
 #define MAX_MIDI_DEV	6
 #define MAX_TIMER_DEV	3
 
 struct fileinfo {
-       	  int mode;	/* Open mode */
+       	  int mode;	      /* Open mode */
+	  DECLARE_FILE();     /* Reference to file-flags. OS-dependent. */
        };
 
 struct address_info {
 	int io_base;
 	int irq;
 	int dma;
+	int always_detect;	/* 1=Trust me, it's there */
 };
 
 #define SYNTH_MAX_VOICES	32
@@ -222,10 +163,13 @@
 		int used_voices;
 		int ptr;		/* For device specific use */
 		unsigned short map[SYNTH_MAX_VOICES]; /* (ch << 8) | (note+1) */
+		int timestamp;
+		int alloc_times[SYNTH_MAX_VOICES];
 	};
 
 struct channel_info {
 		int pgm_num;
+		int bender_value;
 		unsigned char controllers[128];
 	};
 
@@ -242,17 +186,18 @@
 #define OPEN_WRITE	2
 #define OPEN_READWRITE	3
 
-#include "os.h"
 #include "sound_calls.h"
 #include "dev_table.h"
 
 #ifndef DEB
 #define DEB(x)
+#endif
+
+#ifndef DDB
+#define DDB(x)
+#endif
 
 #define TIMER_ARMED	121234
 #define TIMER_NOT_ARMED	1
-
-#define FUTURE_VERSION
-#endif
 
 #endif