patch-2.1.110 linux/drivers/sound/msnd_classic.h

Next file: linux/drivers/sound/msnd_pinnacle.c
Previous file: linux/drivers/sound/msnd_classic.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.109/linux/drivers/sound/msnd_classic.h linux/drivers/sound/msnd_classic.h
@@ -24,7 +24,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  * 
- * $Id: msnd_classic.h,v 1.3 1998/06/09 20:39:34 andrewtv Exp $
+ * $Id: msnd_classic.h,v 1.4 1998/07/14 22:59:25 andrewtv Exp $
  *
  ********************************************************************/
 #ifndef __MSND_CLASSIC_H
@@ -63,19 +63,6 @@
 #define	HIDSP_MIDI_IN_OVER	0x10
 #define	HIDSP_MIDI_OVERRUN_ERR  0x13
 
-#define	HDEX_BASE	       	0x92
-#define	HDEX_PLAY_START		(0 + HDEX_BASE)
-#define	HDEX_PLAY_STOP		(1 + HDEX_BASE)
-#define	HDEX_PLAY_PAUSE		(2 + HDEX_BASE)
-#define	HDEX_PLAY_RESUME	(3 + HDEX_BASE)
-#define	HDEX_RECORD_START	(4 + HDEX_BASE)
-#define	HDEX_RECORD_STOP	(5 + HDEX_BASE)
-#define	HDEX_MIDI_IN_START 	(6 + HDEX_BASE)
-#define	HDEX_MIDI_IN_STOP	(7 + HDEX_BASE)
-#define	HDEX_MIDI_OUT_START	(8 + HDEX_BASE)
-#define	HDEX_MIDI_OUT_STOP	(9 + HDEX_BASE)
-#define	HDEX_AUX_REQ		(10 + HDEX_BASE)
-
 #define	HDEXAR_CLEAR_PEAKS	1
 #define	HDEXAR_IN_SET_POTS	2
 #define	HDEXAR_AUX_SET_POTS	3
@@ -181,6 +168,14 @@
 #  define PERMCODESIZE		sizeof(msndperm)
 #  define INITCODESIZE		sizeof(msndinit)
 #else
+#  ifndef CONFIG_MSNDCLAS_INIT_FILE
+#    define CONFIG_MSNDCLAS_INIT_FILE				\
+				"/etc/sound/msndinit.bin"
+#  endif
+#  ifndef CONFIG_MSNDCLAS_PERM_FILE
+#    define CONFIG_MSNDCLAS_PERM_FILE				\
+				"/etc/sound/msndperm.bin"
+#  endif
 #  define PERMCODEFILE		CONFIG_MSNDCLAS_PERM_FILE
 #  define INITCODEFILE		CONFIG_MSNDCLAS_INIT_FILE
 #  define PERMCODE		dspini

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov