Re: [PATCH] emu10k1: fix efx_voices_mask setting for SBLive

[Lee Revell <rlrevell@joe-job.com>]

[-- Attachment #1: Type: text/plain, Size: 824 bytes --]

On Sat, 2005-02-26 at 19:19 -0500, Lee Revell wrote:
> Also, the "EFX Voices Mask" control is renamed to "Captured FX8010
> Outputs".  This is a trick to ensure the default mixer settings are
> loaded when users upgrade from 1.0.8.  Otherwise, the upgrade process
> will probably restore the old settings which results in the
> "multichannel" capture device only having two channels.  I could not
> think of a better way to get around this issue, and the alternative
> seems to be a slew of bug reports.  Half the testers reported this to me
> as a bug already.
> 
> Anyway, I think the new name is clearer anyway, because there's no
> reason to tell userspace the hardware stores this value as a mask, and
> "voices" is confusing because it implies some relation to the 64
> wavetable/PCM voices.

Sorry, wrong patch.

Lee

[-- Attachment #2: sblive-fix-default-voices-mask.patch --]
[-- Type: text/x-patch, Size: 988 bytes --]

Index: alsa/alsa-kernel/pci/emu10k1/emupcm.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/emu10k1/emupcm.c,v
retrieving revision 1.40
diff -u -r1.40 emupcm.c
--- alsa/alsa-kernel/pci/emu10k1/emupcm.c	17 Feb 2005 14:49:50 -0000	1.40
+++ alsa/alsa-kernel/pci/emu10k1/emupcm.c	27 Feb 2005 00:07:57 -0000
@@ -1405,7 +1405,7 @@
 
 static snd_kcontrol_new_t snd_emu10k1_pcm_efx_voices_mask = {
 	.iface = SNDRV_CTL_ELEM_IFACE_PCM,
-	.name = "EFX voices mask",
+	.name = "Captured FX8010 Outputs",
 	.info = snd_emu10k1_pcm_efx_voices_mask_info,
 	.get = snd_emu10k1_pcm_efx_voices_mask_get,
 	.put = snd_emu10k1_pcm_efx_voices_mask_put
@@ -1690,7 +1690,7 @@
 		emu->efx_voices_mask[0] = 0;
 		emu->efx_voices_mask[1] = 0xffff;
 	} else {
-		emu->efx_voices_mask[0] = 0xffff;
+		emu->efx_voices_mask[0] = 0xffff0000;
 		emu->efx_voices_mask[1] = 0;
 	}
 	snd_ctl_add(emu->card, snd_ctl_new1(&snd_emu10k1_pcm_efx_voices_mask, emu));