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

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

diff -u --recursive --new-file v2.1.66/linux/drivers/sound/sb_mixer.h linux/drivers/sound/sb_mixer.h
@@ -169,11 +169,11 @@
 MIX_ENT(SOUND_MIXER_OGAIN,	0x41, 7, 2, 0x42, 7, 2)
 };
 
-#ifdef SM_GAMES       /* Master volume is lower and PCM & FM volumes
+/* SM_GAMES          Master volume is lower and PCM & FM volumes
 			     higher than with SB Pro. This improves the
 			     sound quality */
 
-static int default_levels[32] =
+static int smg_default_levels[32] =
 {
   0x2020,			/* Master Volume */
   0x4b4b,			/* Bass */
@@ -194,9 +194,7 @@
   0x1515			/* Line3 */
 };
 
-#else  /* If the user selected just plain SB Pro */
-
-static int default_levels[32] =
+static int sb_default_levels[32] =
 {
   0x5a5a,			/* Master Volume */
   0x4b4b,			/* Bass */
@@ -216,7 +214,6 @@
   0x4040,			/* Line2 */
   0x1515			/* Line3 */
 };
-#endif /* SM_GAMES */
 
 static unsigned char sb16_recmasks_L[SOUND_MIXER_NRDEVICES] =
 {

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