[PATCH] Envy24HT

[James Stafford <jstafford@ampltd.com>]

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

One of the attached patches correct a problem with the surround speakers 
with the AUDIO2000 Envy24HT based board. The other patch adds the 
ICE1724.conf file to the alsa-lib/src/conf/cards directory.

[-- Attachment #2: patch-envy24ht-surroundfix.diff --]
[-- Type: application/octet-stream, Size: 646 bytes --]

--- alsa-kernel/pci/ice1712/amp.c	3 Dec 2002 17:53:43 -0000	1.1
+++ alsa-kernel/pci/ice1712/amp.c	4 Dec 2002 15:04:05 -0000
@@ -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 */
 };

[-- Attachment #3: patch-envy24ht-addconf.diff --]
[-- Type: application/octet-stream, Size: 1875 bytes --]

--- alsa-lib/src/conf/cards/Makefile.am	29 Nov 2002 14:50:03 -0000	1.9
+++ alsa-lib/src/conf/cards/Makefile.am	4 Dec 2002 15:04:19 -0000
@@ -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
--- cvs2/alsa-lib/src/conf/cards/ICE1724.conf	Thu Jan  1 01:00:00 1970
+++ cvs-envy24ht/alsa-lib/src/conf/cards/ICE1724.conf	Wed Dec  4 15:34:26 2002
@@ -0,0 +1,100 @@
+#
+# Configuration for the ICE1724 (Envy24HT) chip
+#
+
+<confdir:pcm/front.conf>
+
+ICE1724.pcm.front.0 {
+	@args [ CARD ]
+	@args.CARD {
+		type string
+	}
+	type route
+	ttable.0.0 1
+	ttable.1.1 1
+	slave.pcm {
+		type hw
+		card $CARD
+	}
+}	
+
+<confdir:pcm/surround40.conf>
+
+ICE1724.pcm.surround40.0 {
+	@args [ CARD ]
+	@args.CARD {
+		type string
+	}
+	type route
+	ttable.0.0 1
+	ttable.1.1 1
+	ttable.2.4 1
+	ttable.3.5 1
+	slave.pcm {
+		type hw
+		card $CARD
+	}
+}	
+
+<confdir:pcm/surround51.conf>
+
+ICE1724.pcm.surround51.0 {
+	@args [ CARD ]
+	@args.CARD {
+		type string
+	}
+	type route
+	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 $CARD
+	}
+}
+
+<confdir:pcm/iec958.conf>
+
+ICE1724.pcm.iec958.0 {
+	@args [ CARD AES0 AES1 AES2 AES3 ]
+	@args.CARD {
+		type string
+	}
+	@args.AES0 {
+		type integer
+	}
+	@args.AES1 {
+		type integer
+	}
+	@args.AES2 {
+		type integer
+	}
+	@args.AES3 {
+		type integer
+	}
+	type hooks
+	slave.pcm {
+		type route
+		ttable.0.6 1
+		ttable.1.7 1
+		slave.pcm {
+			type hw
+			card $CARD
+		}
+	}
+	hooks.0 {
+		type ctl_elems
+		hook_args [
+			{
+				interface PCM
+				name "IEC958 Playback PCM Stream"
+				lock true
+				preserve true
+				value [ $AES0 $AES1 $AES2 $AES3 ]
+			}
+		]
+	}
+}

[-- Attachment #4: Type: text/plain, Size: 183 bytes --]

--
James Stafford


mailto:jstafford@ampltd.com

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

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