ALSA CVS update - Takashi Iwai <tiwai@suse.de>

EMU10K1/EMU10K2 driver
Peter Zubaj <pzad@pobox.sk>:
- redesigned the default DSP routing of audigy1/2 boards.
  the normal PCM output is sent through 'Stereo Mix', while
  the independent pcm streams can be attenuated by 'PCM Front',
  'PCM Rear', and 'PCM Center/LFE' volumes.

include/sound/emu10k1.h

@@ -1144,18 +1144,20 @@ int snd_emu10k1_proc_init(emu10k1_t * emu);
 #define CC_REG_NONZERO	C_00000100
 
 /* FX buses */
-#define FXBUS_PCM_LEFT		0x00
-#define FXBUS_PCM_RIGHT		0x01
+#define FXBUS_WAVE_LEFT		0x00
+#define FXBUS_WAVE_RIGHT	0x01
 #define FXBUS_PCM_LEFT_REAR	0x02
 #define FXBUS_PCM_RIGHT_REAR	0x03
 #define FXBUS_MIDI_LEFT		0x04
 #define FXBUS_MIDI_RIGHT	0x05
 #define FXBUS_PCM_CENTER	0x06
 #define FXBUS_PCM_LFE		0x07
-#define FXBUS_PT_LEFT		20
-#define FXBUS_PT_RIGHT		21
+#define FXBUS_PCM_LEFT		0x08
+#define FXBUS_PCM_RIGHT		0x09
 #define FXBUS_MIDI_REVERB	0x0c
 #define FXBUS_MIDI_CHORUS	0x0d
+#define FXBUS_PT_LEFT		0x14
+#define FXBUS_PT_RIGHT		0x15
 
 /* Inputs */
 #define EXTIN_AC97_L	   0x00	/* AC'97 capture channel - left */
@@ -1249,8 +1251,8 @@ int snd_emu10k1_proc_init(emu10k1_t * emu);
 #define A_C_4f1bbcdc	0xd3
 #define A_C_5a7ef9db	0xd4
 #define A_C_00100000	0xd5
-/* 0xd6 = 0x7fffffff  (?) ACCUM? */
-/* 0xd7 = 0x0000000   CCR */
+#define A_GPR_ACCU	0xd6		/* ACCUM, accumulator */
+#define A_GPR_COND	0xd7		/* CCR, condition register */
 /* 0xd8 = noise1 */
 /* 0xd9 = noise2 */
 

sound/pci/emu10k1/emumixer.c

@@ -468,17 +468,16 @@ int __devinit snd_emu10k1_mixer(emu10k1_t *emu)
 		ac97.private_free = snd_emu10k1_mixer_free_ac97;
 		if ((err = snd_ac97_mixer(emu->card, &ac97, &emu->ac97)) < 0)
 			return err;
-		if (emu->audigy && emu->revision == 4) {
-			/* Master/PCM controls on ac97 of Audigy2 has no effect */
-			/* FIXME: keep master volume/switch to be sure.
-			 * once after we check that they play really no roles,
-			 * they shall be removed.
-			 */
-			rename_ctl(card, "Master Playback Switch", "AC97 Master Playback Switch");
-			rename_ctl(card, "Master Playback Volume", "AC97 Master Playback Volume");
+		if (emu->audigy) {
+			/* Master/PCM controls on ac97 of Audigy has no effect */
 			/* pcm controls are removed */
 			remove_ctl(card, "PCM Playback Switch");
 			remove_ctl(card, "PCM Playback Volume");
+			remove_ctl(card, "Master Mono Playback Switch");
+			remove_ctl(card, "Master Mono Playback Volume");
+			remove_ctl(card, "Master Playback Switch");
+			remove_ctl(card, "Master Playback Volume");
+			remove_ctl(card, "PCM Out Path & Mute");
 		}
 	} else {
 		if (emu->APS)
@@ -489,11 +488,10 @@ int __devinit snd_emu10k1_mixer(emu10k1_t *emu)
 			strcpy(emu->card->mixername, "Emu10k1");
 	}
 
-	if (emu->audigy && emu->revision == 4) {
-		/* Audigy2 and Audigy2 EX */
+	if (emu->audigy) {
 		/* use the conventional names */
 		rename_ctl(card, "Wave Playback Volume", "PCM Playback Volume");
-		rename_ctl(card, "Wave Playback Volume", "PCM Capture Volume");
+		/* rename_ctl(card, "Wave Capture Volume", "PCM Capture Volume"); */
 		rename_ctl(card, "Wave Master Playback Volume", "Master Playback Volume");
 	}