patch-2.1.6 linux/drivers/sound/sb_mixer.h

• Lines: 55
• Date: Tue Oct 29 09:31:09 1996
• Orig file: v2.1.5/linux/drivers/sound/sb_mixer.h
• Orig date: Sun Jun 30 11:43:39 1996

diff -u --recursive --new-file v2.1.5/linux/drivers/sound/sb_mixer.h linux/drivers/sound/sb_mixer.h
@@ -6,7 +6,7 @@
 /*
  * Copyright (C) by Hannu Savolainen 1993-1996
  *
- * USS/Lite for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)
+ * OSS/Free for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)
  * Version 2 (June 1991). See the "COPYING" file distributed with this software
  * for more info.
  */
@@ -43,7 +43,8 @@
 #define SB16_MIXER_DEVICES		(SOUND_MASK_SYNTH | SOUND_MASK_PCM | SOUND_MASK_SPEAKER | SOUND_MASK_LINE | SOUND_MASK_MIC | \
 					 SOUND_MASK_CD | \
 					 SOUND_MASK_IGAIN | SOUND_MASK_OGAIN | \
-					 SOUND_MASK_VOLUME | SOUND_MASK_BASS | SOUND_MASK_TREBLE)
+					 SOUND_MASK_VOLUME | SOUND_MASK_BASS | SOUND_MASK_TREBLE | \
+					SOUND_MASK_IMIX)
 
 /*
  * Mixer registers
@@ -160,7 +161,7 @@
 MIX_ENT(SOUND_MIXER_LINE,	0x38, 7, 5, 0x39, 7, 5),
 MIX_ENT(SOUND_MIXER_MIC,	0x3a, 7, 5, 0x00, 0, 0),
 MIX_ENT(SOUND_MIXER_CD,		0x36, 7, 5, 0x37, 7, 5),
-MIX_ENT(SOUND_MIXER_IMIX,	0x00, 0, 0, 0x00, 0, 0),
+MIX_ENT(SOUND_MIXER_IMIX,	0x3c, 0, 1, 0x00, 0, 0),
 MIX_ENT(SOUND_MIXER_ALTPCM,	0x00, 0, 0, 0x00, 0, 0),
 MIX_ENT(SOUND_MIXER_RECLEV,	0x3f, 7, 2, 0x40, 7, 2), /* Obsolete. Use IGAIN */
 MIX_ENT(SOUND_MIXER_IGAIN,	0x3f, 7, 2, 0x40, 7, 2),
@@ -171,7 +172,7 @@
 			     higher than with SB Pro. This improves the
 			     sound quality */
 
-static unsigned short default_levels[SOUND_MIXER_NRDEVICES] =
+static int default_levels[32] =
 {
   0x2020,			/* Master Volume */
   0x4b4b,			/* Bass */
@@ -194,7 +195,7 @@
 
 #else  /* If the user selected just plain SB Pro */
 
-static unsigned short default_levels[SOUND_MIXER_NRDEVICES] =
+static int default_levels[32] =
 {
   0x5a5a,			/* Master Volume */
   0x4b4b,			/* Bass */
@@ -205,7 +206,7 @@
   0x4b4b,			/* Ext Line */
   0x1010,			/* Mic */
   0x4b4b,			/* CD */
-  0x4b4b,			/* Recording monitor */
+  0x0000,			/* Recording monitor */
   0x4b4b,			/* SB PCM */
   0x4b4b,			/* Recording level */
   0x4b4b,			/* Input gain */