Re: Re: [PATCH] emu10k1: minor send routing cleanup

[James@superbug.co.uk]

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

Lee Revell wrote:
> On Wed, 2004-11-17 at 14:38 +0100, Takashi Iwai wrote:
> 
>>>Use snd_emu10k1_compose_audigy_fxrt* macro where appropriate.  Also add
>>>a few comments to explain send routing structure.
>>>
>>>Signed-Off-By: Lee Revell <rlrevell@joe-job.com>
>>
>>Thanks, applied to CVS.
>>
> 
> 
> Sorry, please revert this one.  It disables the right channel.  The
> macro must not be correct.
> 
> Lee
> 

Use the attached patch to fix this problem.

[-- Attachment #2: emu10k1.h.diff --]
[-- Type: text/x-diff, Size: 883 bytes --]

--- emu10k1.h.org	2004-11-21 01:04:06.875103895 +0000
+++ emu10k1.h	2004-11-21 01:04:10.252609912 +0000
@@ -840,10 +840,10 @@
 ((route[0] | (route[1] << 4) | (route[2] << 8) | (route[3] << 12)) << 16)
 
 #define snd_emu10k1_compose_audigy_fxrt1(route) \
-(((unsigned int)route[0] | ((unsigned int)route[1] << 8) | ((unsigned int)route[2] << 16) | ((unsigned int)route[3] << 12)) << 24)
+((unsigned int)route[0] | ((unsigned int)route[1] << 8) | ((unsigned int)route[2] << 16) | ((unsigned int)route[3] << 24))
 
 #define snd_emu10k1_compose_audigy_fxrt2(route) \
-(((unsigned int)route[4] | ((unsigned int)route[5] << 8) | ((unsigned int)route[6] << 16) | ((unsigned int)route[7] << 12)) << 24)
+((unsigned int)route[4] | ((unsigned int)route[5] << 8) | ((unsigned int)route[6] << 16) | ((unsigned int)route[7] << 24))
 
 typedef struct snd_emu10k1_memblk {
 	snd_util_memblk_t mem;