[PATCH] fix for ac97->front speaker routing (was Re: Some Patches for emu10k1)

[PATCH] fix for ac97->front speaker routing (was Re: Some Patches for emu10k1)

[Lee Revell]

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

On Tue, 2004-06-15 at 18:18, Joachim Falk wrote:
> |>But some FX buses seam to be connected to outputs even if there is no
> |>code in the dsp. Is that hardcoded in hardware or configurable and if
> |>yes where ?
> |
> |
> | This is maybe hardware feature or ld10k1 bug. If you connect FX bus
> | 0,1 to AC97 PCM output I think it will stop to do this.
> This seams to be a hardware feature of the EMU10K1 I think because if
> you clear the dsp code than FX bus channels 0,1 and 8,9 will be
> forwarded to Output channels 0,1 and 8,9. This I can say for sure.
> The others (2-7 and 10-15) I can not be sure because I have no speakers
> on these channels or they are not connected to output on my card. But I
> assume that to be the case too. As soon as you start driving an output
> within your DSP code the forwarding seams to vanish. I think this can
> not be a alsa driver feature because you can verify that the DSP really
> is empty by catting /proc/asound/Live/fx8010_acode. So the alsa driver
> has no possibility to magically insert some of its one forwardings if
> none are programmed by the user.

I believe I have figured this out.  The following lines are taken from
8010.h in the kX Project SDK.  This file is basically the same as
emu10k1.h in the ALSA driver, with some interesting additions.  The
following lines are *not* present in the ALSA driver:

    // HCFG2 for 10k2: 0x18:
    #define HCFG_K2                 0x18
    // -- unknown; experiments only FIXME
    #define HCFG_K2_GPINPUT_MASK    0x0000ff00
    #define HCFG_K2_GPOUTPUT_MASK   0x000000ff
    #define HCFG_K2_DISABLE_ANALOG  0x40                    // = 'enable' for Audigy2 (chiprev=4)
    #define HCFG_K2_ENABLE_DIGITAL  0x04
    #define HCFG_K2_BYPASS          0x02                    // drive's internal bypass (?)
    #define HCFG_K2_UNKNOWN_20      0x20
    #define HCFG_K2_UNKNOWN_80      0x80                    // turn off ac97 front -> front (10k2.1)
    #define HCFG_K2_MULTIPURPOSE_JACK       0x2000          // center+swf+rear_center (a2/a2ex)
                                                            // + digital for generic 10k2
    #define HCFG_K2_DIGITAL_JACK    0x1000                  // digital for a2 platinum
    #define HCFG_K2_FRONT_JACK      0x4000
    #define HCFG_K2_REAR_JACK       0x8000
    #define HCFG_K2_PHONES_JACK     0x0100          // LiveDrive

    // outputs:
    //   for audigy2 platinum: 0xa00
    //   for a2 platinum ex: 0x1c00
    //   for a1 platinum: 0x0

It appears that HCFG_K2_UNKNOWN_80 is used to disable the ac97 front -> front 
output routing.

If you compare 8010.h to emu10k1.h, there are several ofthese places where gaps 
appear in the sequence of register values, and they have filled many of them in,
by reverse engineering.

I have attached a patch to add these defines to emu10k1.h, renaming the variables 
in keeping with the ALSA convention.  Please retain the lines that attribute this code 
to the kX project; I added this because there is a part of 8010.h which they copied 
from emu10k1.h (the DBG_ stuff), and they give credit to ALSA in the comments.

Lee




[-- Attachment #2: Type: text/x-patch, Size: 1669 bytes --]

Index: alsa-kernel/include/emu10k1.h
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/include/emu10k1.h,v
retrieving revision 1.41
diff -u -r1.41 emu10k1.h
--- alsa-kernel/include/emu10k1.h	23 Jun 2004 11:49:07 -0000	1.41
+++ alsa-kernel/include/emu10k1.h	26 Jun 2004 04:56:40 -0000
@@ -218,6 +218,32 @@
 						/* Should be set to 1 when the EMU10K1 is	*/
 						/* completely initialized.			*/
 
+/* the following A_HCFG_* lines (including comments) are taken from 8010.h in the kX driver SDK.*/
+
+// HCFG2 for 10k2: 0x18:
+#define A_HCFG                 0x18
+// -- unknown; experiments only FIXME
+#define A_HCFG_GPINPUT_MASK    0x0000ff00
+#define A_HCFG_GPOUTPUT_MASK   0x000000ff
+#define A_HCFG_DISABLE_ANALOG  0x40		/* 'enable' for Audigy2 (chiprev=4)		*/
+#define A_HCFG_ENABLE_DIGITAL  0x04
+#define A_HCFG_BYPASS          0x02		/* drive's internal bypass (?)			*/
+#define A_HCFG_UNKNOWN_20      0x20
+#define A_HCFG_UNKNOWN_80      0x80		/* turn off ac97 front -> front (10k2.1)	*/
+#define A_HCFG_MULTIPURPOSE_JACK       0x2000	/* center+swf+rear_center (a2/a2ex)		*/
+						/* + digital for generic 10k2			*/
+#define A_HCFG_DIGITAL_JACK    0x1000		/* digital for a2 platinum			*/
+#define A_HCFG_FRONT_JACK      0x4000
+#define A_HCFG_REAR_JACK       0x8000
+#define A_HCFG_PHONES_JACK     0x0100		/* LiveDrive					*/
+
+// outputs:
+//   for audigy2 platinum: 0xa00
+//   for a2 platinum ex: 0x1c00
+//   for a1 platinum: 0x0
+
+/* end section from kX driver									*/
+
 //For Audigy, MPU port move to 0x70-0x74 ptr register
 
 #define MUDATA			0x18		/* MPU401 data register (8 bits)       		*/

Re: [PATCH] fix for ac97->front speaker routing (was Re: Some Patches for emu10k1)

[James Courtier-Dutton]

Lee Revell wrote:
> On Tue, 2004-06-15 at 18:18, Joachim Falk wrote:
> 
>>|>But some FX buses seam to be connected to outputs even if there is no
>>|>code in the dsp. Is that hardcoded in hardware or configurable and if
>>|>yes where ?
>>|
>>|
>>| This is maybe hardware feature or ld10k1 bug. If you connect FX bus
>>| 0,1 to AC97 PCM output I think it will stop to do this.
>>This seams to be a hardware feature of the EMU10K1 I think because if
>>you clear the dsp code than FX bus channels 0,1 and 8,9 will be
>>forwarded to Output channels 0,1 and 8,9. This I can say for sure.
>>The others (2-7 and 10-15) I can not be sure because I have no speakers
>>on these channels or they are not connected to output on my card. But I
>>assume that to be the case too. As soon as you start driving an output
>>within your DSP code the forwarding seams to vanish. I think this can
>>not be a alsa driver feature because you can verify that the DSP really
>>is empty by catting /proc/asound/Live/fx8010_acode. So the alsa driver
>>has no possibility to magically insert some of its one forwardings if
>>none are programmed by the user.
> 
> 
> I believe I have figured this out.  The following lines are taken from
> 8010.h in the kX Project SDK.  This file is basically the same as
> emu10k1.h in the ALSA driver, with some interesting additions.  The
> following lines are *not* present in the ALSA driver:
> 

Have you actually tested changing those bits? Does it actually stop the 
AC97 output reaching the Front speakers?

I have been working on the AudigyLS driver that uses what I will call a 
P17 chip.

The Audigy 2 card has a P16V chip.
The P17 chip is quite similar to the P16V chip.

I have found that the general layout of the chips is that all inputs go 
into the P17 chip. The P17 chip then has some registers that adjust the 
volume of different routes.
For example. On the AudigyLS, all the input from the MIC or LINE IN goes 
via the PLAYBACK parts(not the CAPTURE) of the AC97 chip and into the 
Philips 24bit ADC.
MIC -> AC97 -> Analog link -> Philips 24bit ADC -> P17 -> P17 register 
volume control -> Front speakers.

The P17 then has a register that sets the volume for the ADC direct to 
Front speakers route. Most people will want the MIC to be recorded, and 
not be sent directly to the speakers, so I have set this route to muted.

I expect the Audigy 2 is much the same.
1) MIC -> AC97 -> Analog link -> Philips ADC -> P16V -> P16V register(a) 
volume control -> Front speakers.
2) CPU -> DMA access for EMU10k2 -> I2S digital link -> P16V -> P16V 
register(b) volume control -> Front speakers.
3) CPU -> DMA access for P16V -> P16V register(c) volume control -> 
Front speakers.

There are actually some special lines of code in the emu10k1_main.c:
/* Hacks for Alice3 to work independent of haP16V driver */
...

Those are setting up the "I2S digital link" for the Audigy2.

P16V register(a),(b) and (c) are probably different registers.

The default volume levels are all set at 0dB, so as the "hacks for 
Alice3" don't include register(a), one will by default get feedback from 
the MIC direct to the front speakers.

I have almost got enough information on the P16V now, in order to make 
use of it.
I have:
1) DMA control registers (They are the same for the P16V and P17).
2) Switching between 48khz and 96khz.
I still need:
1) Which bits to set to get the interrupts working.
2) Setting 24bit output mode.

Work so far on the P17
I still need:
1) Switching between 48khz and 96khz.
2) Setting 24bit output mode.
I already have:
1) DMA control registers.
2) Interrupts working.
3) Volume controls
4) Digital/Analog outputs.

Cheers
James


-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 - 
digital self defense, top technical experts, no vendor pitches, 
unmatched networking opportunities. Visit www.blackhat.com

Re: [PATCH] fix for ac97->front speaker routing (was Re: Some Patches for emu10k1)

[Peter Zubaj]

Hi,

>emu10k1.h in the ALSA driver, with some interesting additions.  The
>following lines are *not* present in the ALSA driver:

They are in alsa but with diffrent names (most of them).
Look at A_IOCFG in emu10k1.h
I prefer alsa names (I am familiar with them).

>It appears that HCFG_K2_UNKNOWN_80 is used to disable the ac97 front
-> >front 
>output routing.

Yes, but this is used only on audigy. I discover meaning for this bit
and kx project has this information about it from me.

It is used in emu10k1_main.c
} else {
    /* Disable routing from AC97 line out to Front speakers */
    outl(inl(emu->port + A_IOCFG) | 0x0080, emu->port + A_IOCFG);
} 

In alsa emu10k1.h is every thing what is public available.

Peter Zubaj
____________________________________
http://www.pobox.sk/ - spolahliva a bezpecna prevadzka





-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 -
digital self defense, top technical experts, no vendor pitches,
unmatched networking opportunities. Visit www.blackhat.com

Re: [PATCH] fix for ac97->front speaker routing (was Re: Some Patches for emu10k1)

[Lee Revell]

On Mon, 2004-06-28 at 02:55, Peter Zubaj wrote:
> Hi,
> 
> >emu10k1.h in the ALSA driver, with some interesting additions.  The
> >following lines are *not* present in the ALSA driver:
> 
> They are in alsa but with diffrent names (most of them).
> Look at A_IOCFG in emu10k1.h
> I prefer alsa names (I am familiar with them).
> 

Yes, agreed, I prefer the prefixing ( FOO_ ) to infixing ( _FOO_ ).

Some of these are named values in the kX driver but magic numbers in the
ALSA driver.

Lee








-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 - 
digital self defense, top technical experts, no vendor pitches, 
unmatched networking opportunities. Visit www.blackhat.com