Skip to contentSkip to conversation

[Fwd: AudioTrak Prodigy 7.1 support - patch]

PATCH Applied Apostolos Dimitromanolakis 3 participants 3 messages Nov 10, 2003 – Nov 12, 2003 2 messages not in the archive

lore
Share & tools
lore

Apostolos Dimitromanolakis

author
#0 lore raw

PATCH 1/1 [Fwd: AudioTrak Prodigy 7.1 support - patch]

Well, this is the first version of the audiotrak prodigy 7.1 driver.

It is basically a copy of aureon.c with some fixes here and there and support for the hi-fi headphone amplifier of the prodigy. Communication with the DAC/ADC chip (wm8770) seems ok and is exactly the same as the Terratec Aureon. Unfortunately, pretty much everything else does not work. This includes any capture and any digital input/output. Moreover clicks and pops occur when you try to change adc mux and other mixer fiddling. Any suggestions/ideas welcome.

I will work more on it to see if I can get other things working. There
are some io-traces I grabbed from windows with DriverStudio probably you can figure some stuff out of them, if anybody wants them. An updated version hopefully will be out soon.

PS. The patch is splitted into two files one for the alsa-driver tree and the other for the alsa-kernel. It is against 0.9.8 but applies to CVS too.

Cheers..

pci/ice1712/prodigy.c +2 -0
diff --new-file -d -u --exclude '*.o' --exclude .depend -r alsa-driver-0.9.8.orig/pci/ice1712/prodigy.c alsa-driver-0.9.8/pci/ice1712/prodigy.c
@@ -0,0 +1,2 @@
+#define __NO_VERSION__
+#include "../../alsa-kernel/pci/ice1712/prodigy.c"
alsa-kernel/pci/ice1712/ice1724.c +9 -0
diff --new-file -b -d -u --exclude '*.o' --exclude .depend -r alsa-driver-0.9.8.orig/alsa-kernel/pci/ice1712/ice1724.c alsa-driver-0.9.8/alsa-kernel/pci/ice1712/ice1724.c
@@ -43,6 +43,8 @@
 #include "amp.h"
 #include "revo.h"
 #include "aureon.h"
+#include "prodigy.h"
+
 
 MODULE_AUTHOR("Jaroslav Kysela <[email protected]>");
 MODULE_DESCRIPTION("ICEnsemble ICE1724 (Envy24HT)");

@@ -52,6 +54,7 @@
 	       REVO_DEVICE_DESC
 	       AMP_AUDIO2000_DEVICE_DESC
 	       AUREON_DEVICE_DESC
+	       PRODIGY_DEVICE_DESC
 		"{VIA,VT1724},"
 		"{ICEnsemble,Generic ICE1724},"
 		"{ICEnsemble,Generic Envy24HT}}");

@@ -1576,6 +1579,7 @@
 	snd_vt1724_revo_cards,
 	snd_vt1724_amp_cards, 
 	snd_vt1724_aureon_cards,
+	snd_vt1724_prodigy_cards,
 	0,
 };
 

@@ -1610,6 +1614,9 @@
 				(snd_vt1724_read_i2c(ice, dev, 0x02) << 16) | 
 				(snd_vt1724_read_i2c(ice, dev, 0x03) << 24);
 
+
+	snd_printk("eeprom subvendor=%x\n",ice->eeprom.subvendor);
+
 	/* if the EEPROM is given by the driver, use it */
 	for (tbl = card_tables; *tbl; tbl++) {
 		for (c = *tbl; c->subvendor; c++) {

@@ -1627,6 +1634,8 @@
 
  found:
 	ice->eeprom.size = snd_vt1724_read_i2c(ice, dev, 0x04);
+
+
 	if (ice->eeprom.size < 6)
 		ice->eeprom.size = 32;
 	else if (ice->eeprom.size > 32) {
alsa-kernel/pci/ice1712/Makefile +1 -1
diff --new-file -b -d -u --exclude '*.o' --exclude .depend -r alsa-driver-0.9.8.orig/alsa-kernel/pci/ice1712/Makefile alsa-driver-0.9.8/alsa-kernel/pci/ice1712/Makefile
@@ -5,7 +5,7 @@
 
 snd-ice17xx-ak4xxx-objs := ak4xxx.o
 snd-ice1712-objs := ice1712.o delta.o hoontech.o ews.o
-snd-ice1724-objs := ice1724.o amp.o revo.o aureon.o
+snd-ice1724-objs := ice1724.o amp.o revo.o aureon.o prodigy.o
 
 # Toplevel Module Dependency
 obj-$(CONFIG_SND_ICE1712) += snd-ice1712.o snd-ice17xx-ak4xxx.o
alsa-kernel/pci/ice1712/prodigy.c +545 -0

545 lines not on this page · raw message

alsa-kernel/pci/ice1712/prodigy.h +67 -0

67 lines not on this page · raw message

Applied
#1 lore raw

At Sun, 09 Nov 2003 21:50:36 -0500,

Quoted 11 lines · Apostolos Dimitromanolakis

Well, this is the first version of the audiotrak prodigy 7.1 driver.

It is basically a copy of aureon.c with some fixes here and there and support for the hi-fi headphone amplifier of the prodigy. Communication with the DAC/ADC chip (wm8770) seems ok and is exactly the same as the Terratec Aureon. Unfortunately, pretty much everything else does not work. This includes any capture and any digital input/output. Moreover clicks and pops occur when you try to change adc mux and other mixer fiddling. Any suggestions/ideas welcome.

Quoted 8 lines

I will work more on it to see if I can get other things working. There
are some io-traces I grabbed from windows with DriverStudio probably you can figure some stuff out of them, if anybody wants them. An updated version hopefully will be out soon.

PS. The patch is splitted into two files one for the alsa-driver tree and the other for the alsa-kernel. It is against 0.9.8 but applies to CVS too.

applied to the cvs tree now.

thanks!

Takashi

-------------------------------------------------------
This SF.Net email sponsored by: ApacheCon 2003, 16-19 November in Las Vegas. Learn firsthand the latest developments in Apache, PHP, Perl, XML, Java, MySQL, WebDAV, and more! http://www.apachecon.com/

#4 lore raw
In reply to a message not in the archive
Quoted 2 lines · Apostolos Dimitromanolakis

My mistake.. fixed!

Yes, it's fixed. But I think this patch is better.

martin

pci/ice1712/prodigy.c renamed from alsa-cvs/alsa-kernel/pci/ice1712/prodigy.c +0 -2
@@ -163,8 +163,6 @@
 
 static int prodigy_hpamp_info(snd_kcontrol_t *k, snd_ctl_elem_info_t *uinfo)
 {
-        uinfo->type= SNDRV_CTL_ELEM_TYPE_INTEGER;
-
 	static char *texts[2] = {
 		"Off", "On"
 	};

-------------------------------------------------------
This SF.Net email sponsored by: ApacheCon 2003, 16-19 November in Las Vegas. Learn firsthand the latest developments in Apache, PHP, Perl, XML, Java, MySQL, WebDAV, and more! http://www.apachecon.com/