2009-10-01 18:07:53

by Sven Eckelmann

Subject: [PATCH] ALSA: ctxfi: Swapped SURROUND-SIDE mute

On Soundblaster X-FI Titenium with emu20k2 the SIDE and SURROUND mute
functions are swapped.
It was checked with 'speaker-test -c 8 -s 3' and (un)mute surround or
'speaker-test -c 8 -s 7' and (un)mute side. The volume seems not
to be affected and works as expected.

Signed-off-by: Sven Eckelmann <[email protected]>
---
This patch is tested with commit 55fe27f7e2c9d24ce870136bd99ae67b020122d1
which arranges the channels on emu20k2.

sound/pci/ctxfi/ctatc.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c
index b1b3a64..7545464 100644
--- a/sound/pci/ctxfi/ctatc.c
+++ b/sound/pci/ctxfi/ctatc.c
@@ -1037,7 +1037,7 @@ static int atc_line_front_unmute(struct ct_atc *atc, unsigned char state)

static int atc_line_surround_unmute(struct ct_atc *atc, unsigned char state)
{
- return atc_daio_unmute(atc, state, LINEO4);
+ return atc_daio_unmute(atc, state, LINEO2);
}

static int atc_line_clfe_unmute(struct ct_atc *atc, unsigned char state)
@@ -1047,7 +1047,7 @@ static int atc_line_clfe_unmute(struct ct_atc *atc, unsigned char state)

static int atc_line_rear_unmute(struct ct_atc *atc, unsigned char state)
{
- return atc_daio_unmute(atc, state, LINEO2);
+ return atc_daio_unmute(atc, state, LINEO4);
}

static int atc_line_in_unmute(struct ct_atc *atc, unsigned char state)
--
1.6.4.3

2009-10-02 05:47:01

by Takashi Iwai

Subject: Re: [PATCH] ALSA: ctxfi: Swapped SURROUND-SIDE mute

At Thu, 1 Oct 2009 20:06:39 +0200,
Sven Eckelmann wrote:
>
> On Soundblaster X-FI Titenium with emu20k2 the SIDE and SURROUND mute
> functions are swapped.
> It was checked with 'speaker-test -c 8 -s 3' and (un)mute surround or
> 'speaker-test -c 8 -s 7' and (un)mute side. The volume seems not
> to be affected and works as expected.
>
> Signed-off-by: Sven Eckelmann <[email protected]>
> ---
> This patch is tested with commit 55fe27f7e2c9d24ce870136bd99ae67b020122d1
> which arranges the channels on emu20k2.

Thanks, applied now.


Takashi

> sound/pci/ctxfi/ctatc.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c
> index b1b3a64..7545464 100644
> --- a/sound/pci/ctxfi/ctatc.c
> +++ b/sound/pci/ctxfi/ctatc.c
> @@ -1037,7 +1037,7 @@ static int atc_line_front_unmute(struct ct_atc *atc, unsigned char state)
>
> static int atc_line_surround_unmute(struct ct_atc *atc, unsigned char state)
> {
> - return atc_daio_unmute(atc, state, LINEO4);
> + return atc_daio_unmute(atc, state, LINEO2);
> }
>
> static int atc_line_clfe_unmute(struct ct_atc *atc, unsigned char state)
> @@ -1047,7 +1047,7 @@ static int atc_line_clfe_unmute(struct ct_atc *atc, unsigned char state)
>
> static int atc_line_rear_unmute(struct ct_atc *atc, unsigned char state)
> {
> - return atc_daio_unmute(atc, state, LINEO2);
> + return atc_daio_unmute(atc, state, LINEO4);
> }
>
> static int atc_line_in_unmute(struct ct_atc *atc, unsigned char state)
> --
> 1.6.4.3
>