Skip to contentSkip to conversation

Envy24HT

PATCH Jaroslav Kysela 2 participants 3 messages Dec 4, 2002 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw
Quoted 8 lines · James Stafford
Quoted 3 lines · you

I think that the default should be left in the AC97 code and write the appropriate configuration after snd_ac97_mixer() call when you detect your hardware and VT1616 codec.

I have added a build_controls function in the amp.c file which sets the relavent ac97 register. Is this the correct way to do this?

The controls should be built in the ac97_codec.c, but the initial settings of AC97 registers might be done in the amp.c file.

Quoted 23 lines
Quoted 4 lines

We send data in this order: channel0,1 = front; channel2,3 = rear; channel4,5 = center/lfe ; if your hardware has swapped some stereo paths, you need to swap channels in software - see alsa-lib/src/conf/cards/ICH.conf - ICH.pcm.surround51.0 {} section

Once I have a conf file, what do I do with it and how do I use it?

As a test, I added

pcm.ice1724 {
	type plug
	ttable.0.0 1
	ttable.1.1 1
	ttable.2.4 1
	ttable.3.5 1
	ttable.4.2 1
	ttable.5.3 1
	slave.pcm {
		type hw
		card 0
		device 0
	}
}
Quoted 2 lines

to my ~/.asoundrc file.
The channels were then routed correctly when using the "ice1724" device.

If you follow the ICH.conf file (and/or ICE1712.conf) file, then you can use 'surround51' device as ac3dec uses: 'aplay -D plug:surround51' . The new name will be ICE1724.conf (I changed the driver ID for the new chip). Unfortunately, at the time, we cannot distinguish more hardware variations for given driver, but hopefully, it will change in the future.

Jaroslav

-----
Jaroslav Kysela <[email protected]>
Linux Kernel Sound Maintainer
ALSA Project, SuSE Labs

-------------------------------------------------------
This SF.net email is sponsored by: Microsoft Visual Studio.NET comprehensive development tool, built to increase your productivity. Try a free online hosted session at:
http://ads.sourceforge.net/cgi-bin/redirect.pl?micr0003en

#2 lore raw
Quoted 5 lines · Jaroslav Kysela
Quoted 2 lines

I have added a build_controls function in the amp.c file which sets the relavent ac97 register. Is this the correct way to do this?

The controls should be built in the ac97_codec.c, but the initial settings of AC97 registers might be done in the amp.c file.

All the controls are built in ac97_codec.c. I only write to one of the ac97 registers in the build_controls function from the snd_ice1712_card_info structure because it was the only card specific function call after the call to snd_ice1712_ac97_mixer. Would it be better to add a new function pointer to the snd_ice1712_card_info structure for setting the initial values of the chip specific ac97 registers (such as the rerouting of some of the outputs) ?
I thought it was best not to write the ac97 register in ice1712.c since not all Envy24HT cards use the VT1616.

Quoted 6 lines

If you follow the ICH.conf file (and/or ICE1712.conf) file, then you can use 'surround51' device as ac3dec uses: 'aplay -D plug:surround51' . The new name will be ICE1724.conf (I changed the driver ID for the new chip). Unfortunately, at the time, we cannot distinguish more hardware variations for given driver, but hopefully, it will change in the future.

Ok, I understand you now.

--
James Stafford

mailto:[email protected]

Advanced Micro Peripherals Ltd
Unit 17
Sedgeway Business Park
Witchford
Cambridge
CB6 2HY

Tel: +44 1353 659 500
Fax:+44 1353 659 600

-------------------------------------------------------
This SF.net email is sponsored by: Microsoft Visual Studio.NET comprehensive development tool, built to increase your productivity. Try a free online hosted session at:
http://ads.sourceforge.net/cgi-bin/redirect.pl?micr0003en

#3 lore raw

Here are some more patches for Envy24HT support in the ICE1712 driver. For now, I have left some of the debug code I accidentally left in the last patch, since it is only added to the /proc output.

The name of the PCM streams for the ICE1724 is changed to "ICE1724 multi" from "ICE1712 multi"
The ICE1724.conf file is added to alsa-lib/src/conf/cards to fix the channel routing

Index: alsa-kernel/pci/ice1712/amp.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/ice1712/amp.c,v retrieving revision 1.1

pci/ice1712/amp.c +4 -0
diff -u -r1.1 amp.c
@@ -42,6 +42,12 @@
 	return 0;
 }
 
+static int __devinit snd_vt1724_amp_add_controls(ice1712_t *ice)
+{
+	/* we use pins 39 and 41 of the VT1616 for left and right read outputs */
+	snd_ac97_write_cache(ice->ac97, 0x5a, snd_ac97_read(ice->ac97, 0x5a) &

~0x8000);
+}
+

/* entry point */
struct snd_ice1712_card_info snd_vt1724_amp_cards[] __devinitdata = {
@@ -49,6 +55,7 @@
VT1724_SUBDEVICE_AUDIO2000,
"AMP Ltd AUDIO2000",
snd_vt1724_amp_init,
+ snd_vt1724_amp_add_controls,
},
{ } /* terminator */
};
Index: alsa-kernel/pci/ice1712/ice1712.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/ice1712/ice1712.c,v retrieving revision 1.14

pci/ice1712/ice1712.c +9 -2
diff -u -r1.14 ice1712.c
@@ -1405,7 +1405,11 @@
 
 	if (rpcm)
 		*rpcm = NULL;
-	err = snd_pcm_new(ice->card, "ICE1712 multi", device, 1, 1, &pcm);
+	if (ice->vt1724)
+		err = snd_pcm_new(ice->card, "ICE1724 multi", device, 1, 1, &pcm);
+	else
+		err = snd_pcm_new(ice->card, "ICE1712 multi", device, 1, 1, &pcm);
+
 	if (err < 0)
 		return err;
 
@@ -1415,7 +1419,10 @@
 	pcm->private_data = ice;
 	pcm->private_free = snd_ice1712_pcm_profi_free;
 	pcm->info_flags = 0;
 
-	strcpy(pcm->name, "ICE1712 multi");
+	if (ice->vt1724)
+		strcpy(pcm->name, "ICE1724 multi");
+	else
+		strcpy(pcm->name, "ICE1712 multi");
 
 	snd_pcm_lib_preallocate_pci_pages_for_all(ice->pci, pcm, 256*1024,

256*1024);

Index: alsa-lib/src/conf/cards/Makefile.am
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/conf/cards/Makefile.am,v retrieving revision 1.9

src/conf/cards/Makefile.am +1 -0
diff -u -r1.9 Makefile.am
@@ -10,6 +10,7 @@
 	FM801.conf \
 	GUS.conf \
 	ICE1712.conf \
+	ICE1724.conf \
 	ICH.conf \
 	RME9636.conf \
 	RME9652.conf \

diff -u -N -r cvs2/alsa-lib/src/conf/cards/ICE1724.conf cvs-envy24ht/alsa-lib/src/conf/cards/ICE1724.conf

alsa-lib/src/conf/cards/ICE1724.conf +100 -0

100 lines not on this page · raw message

--
James Stafford

mailto:[email protected]

Advanced Micro Peripherals Ltd
Unit 17
Sedgeway Business Park
Witchford
Cambridge
CB6 2HY

Tel: +44 1353 659 500
Fax:+44 1353 659 600

-------------------------------------------------------
This SF.net email is sponsored by: Microsoft Visual Studio.NET comprehensive development tool, built to increase your productivity. Try a free online hosted session at:
http://ads.sourceforge.net/cgi-bin/redirect.pl?micr0003en