emu10k1: fix efx_voices_mask setting for SBLive
PATCH 1/1 emu10k1: fix efx_voices_mask setting for SBLive
This patch fixes a stupid thinko where we set the low 16 bits of the FXWC register, which correspond to the 16 physical outs. We should be setting the high 16 bits, which correspond to the physical inputs (connected in emufx.c). The Audigy was not affected by this bug.
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.
Index: alsa/alsa-kernel/pci/emu10k1/emupcm.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/emu10k1/emupcm.c,v retrieving revision 1.40
alsa-kernel/pci/emu10k1/emupcm.c +1 -1
@@ -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));
Quoted 9 lines · Lee Revell
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.
Quoted 4 lines
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
Index: alsa/alsa-kernel/pci/emu10k1/emupcm.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/emu10k1/emupcm.c,v retrieving revision 1.40
alsa-kernel/pci/emu10k1/emupcm.c +2 -2
@@ -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));
Quoted 10 lines · Lee Revell
Quoted 9 lines · Lee Revell
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.
Quoted 7 lines
Quoted 4 lines
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.
Please apply the second chunk of the patch ASAP, it's an important bug fix. The first part (renaming "EFX Voices Mask") is optional.
Lee
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
Jaroslav Kysela
AppliedQuoted 2 lines · Lee Revell
Please apply the second chunk of the patch ASAP, it's an important bug fix. The first part (renaming "EFX Voices Mask") is optional.
Applied.
Jaroslav
-----
Jaroslav Kysela <[email protected]>
Linux Kernel Sound Maintainer
ALSA Project, SUSE Labs
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click