[PATCH] emu10k1: minor send routing cleanup

[PATCH] emu10k1: minor send routing cleanup

[Lee Revell]

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>

diff -Nru alsa-multi/alsa-kernel/include/emu10k1.h alsa-dev/alsa-kernel/include/emu10k1.h
--- alsa-multi/alsa-kernel/include/emu10k1.h	2004-11-16 17:44:27.000000000 -0500
+++ alsa-dev/alsa-kernel/include/emu10k1.h	2004-11-16 17:31:39.000000000 -0500
@@ -833,6 +833,7 @@
 };
 
 typedef struct {
+	/* mono, left, right x 8 sends (4 on emu10k1) */
 	unsigned char send_routing[3][8];
 	unsigned char send_volume[3][8];
 	unsigned short attn[3];
diff -Nru alsa-multi/alsa-kernel/pci/emu10k1/emupcm.c alsa-dev/alsa-kernel/pci/emu10k1/emupcm.c
--- alsa-multi/alsa-kernel/pci/emu10k1/emupcm.c	2004-11-16 17:44:25.000000000 -0500
+++ alsa-dev/alsa-kernel/pci/emu10k1/emupcm.c	2004-11-16 17:31:30.000000000 -0500
@@ -336,6 +336,7 @@
 		send_routing[3] = 3;
 		memset(send_amount, 0, sizeof(send_amount));
 	} else {
+		/* mono, left, right (master voice = left) */
 		tmp = stereo ? (master ? 1 : 2) : 0;
 		memcpy(send_routing, &mix->send_routing[tmp][0], 8);
 		memcpy(send_amount, &mix->send_volume[tmp][0], 8);
@@ -363,15 +364,9 @@
 	// setup routing
 	if (emu->audigy) {
 		snd_emu10k1_ptr_write(emu, A_FXRT1, voice,
-				      ((unsigned int)send_routing[3] << 24) |
-				      ((unsigned int)send_routing[2] << 16) |
-				      ((unsigned int)send_routing[1] << 8) |
-				      (unsigned int)send_routing[0]);
+				      snd_emu10k1_compose_audigy_fxrt1(send_routing));
 		snd_emu10k1_ptr_write(emu, A_FXRT2, voice,
-				      ((unsigned int)send_routing[7] << 24) |
-				      ((unsigned int)send_routing[6] << 16) |
-				      ((unsigned int)send_routing[5] << 8) |
-				      (unsigned int)send_routing[4]);
+				      snd_emu10k1_compose_audigy_fxrt2(send_routing));
 		snd_emu10k1_ptr_write(emu, A_SENDAMOUNTS, voice,
 				      ((unsigned int)send_amount[4] << 24) |
 				      ((unsigned int)send_amount[5] << 16) |




-------------------------------------------------------
This SF.Net email is sponsored by: InterSystems CACHE
FREE OODBMS DOWNLOAD - A multidimensional database that combines
robust object and relational technologies, making it a perfect match
for Java, C++,COM, XML, ODBC and JDBC. www.intersystems.com/match8

Re: [PATCH] emu10k1: minor send routing cleanup

[Takashi Iwai]

At Tue, 16 Nov 2004 17:55:45 -0500,
Lee Revell 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.


Takashi


-------------------------------------------------------
This SF.Net email is sponsored by: InterSystems CACHE
FREE OODBMS DOWNLOAD - A multidimensional database that combines
robust object and relational technologies, making it a perfect match
for Java, C++,COM, XML, ODBC and JDBC. www.intersystems.com/match8

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

[Lee Revell]

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



-------------------------------------------------------
This SF.Net email is sponsored by: InterSystems CACHE
FREE OODBMS DOWNLOAD - A multidimensional database that combines
robust object and relational technologies, making it a perfect match
for Java, C++,COM, XML, ODBC and JDBC. www.intersystems.com/match8

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

[James]

[-- 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;

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

[Takashi Iwai]

At Sun, 21 Nov 2004 01:21:25 +0000,
James@superbug.co.uk wrote:
> 
> [1  <text/plain; iso-8859-1 (quoted-printable)>]
> 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.

Could you give the summary and signed-off-by lines, please?

thanks,


Takashi

> [2 emu10k1.h.diff <text/x-diff; iso-8859-1 (7bit)>]
> --- 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;


-------------------------------------------------------
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://productguide.itmanagersjournal.com/

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

[James Courtier-Dutton]

Takashi Iwai wrote:
> At Sun, 21 Nov 2004 01:21:25 +0000,
> James@superbug.co.uk wrote:
> 
>>[1  <text/plain; iso-8859-1 (quoted-printable)>]
>>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.
> 
> 
> Could you give the summary and signed-off-by lines, please?

Summary: Fixes the "It disables the right channel" bug.
Signed-off-by: James Courtier-Dutton

> 
> thanks,
> 
> 
> Takashi
> 
> 
>>[2 emu10k1.h.diff <text/x-diff; iso-8859-1 (7bit)>]
>>--- 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;
> 
> 
> 



-------------------------------------------------------
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://productguide.itmanagersjournal.com/

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

[Takashi Iwai]

At Mon, 22 Nov 2004 18:30:55 +0000,
James Courtier-Dutton wrote:
> 
> Takashi Iwai wrote:
> > At Sun, 21 Nov 2004 01:21:25 +0000,
> > James@superbug.co.uk wrote:
> > 
> >>[1  <text/plain; iso-8859-1 (quoted-printable)>]
> >>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.
> > 
> > 
> > Could you give the summary and signed-off-by lines, please?
> 
> Summary: Fixes the "It disables the right channel" bug.
> Signed-off-by: James Courtier-Dutton

Ok, applied now.
Thanks.


Takashi


-------------------------------------------------------
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://productguide.itmanagersjournal.com/