Skip to contentSkip to conversation

display EFGH sends in proc file for audigy

PATCH In review Lee Revell 1 participant 2 messages Nov 17, 2004

lore
Share & tools
lore

Lee Revell

author
#0 lore raw

PATCH 1/1 display EFGH sends in proc file for audigy

Currently we only display the first four sends even on the Audigy which has 8 sends. This obscures the fact that we set sends EFGH all to zero by default which is technically illegal. (Though it seems to work, the kX Windows driver sets these last 4 sends to high channels (62-24) and never sets two sends to the same address as the header file instructs).

This patch adds display of sends EFGH in the /proc file.

Index: alsa/alsa-kernel/pci/emu10k1/emuproc.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/emu10k1/emuproc.c,v retrieving revision 1.21

alsa-kernel/pci/emu10k1/emuproc.c +8 -1
diff -u -r1.21 emuproc.c
@@ -175,7 +175,7 @@
 	};
 
 	emu10k1_t *emu = entry->private_data;
-	unsigned int val;
+	unsigned int val, val1;
 	int nefx = emu->audigy ? 64 : 32;
 	char **outputs = emu->audigy ? audigy_outs : creative_outs;
 	int idx;
@@ -184,6 +184,8 @@
 	val = emu->audigy ?
 		snd_emu10k1_ptr_read(emu, A_FXRT1, 0) :
 		snd_emu10k1_ptr_read(emu, FXRT, 0);
+	if (emu->audigy)
+		val2 = snd_emu10k1_ptr_read(emu, A_FXRT2, 0);
 	snd_iprintf(buffer, "Card                  : %s\n",
 		    emu->audigy ? "Audigy" : (emu->APS ? "EMU APS" : "Creative"));
 	snd_iprintf(buffer, "Internal TRAM (words) : 0x%x\n", emu->fx8010.itram_size);
@@ -195,6 +197,11 @@
 			    (val >> 8) & 0x3f,
 			    (val >> 16) & 0x3f,
 			    (val >> 24) & 0x3f);
+		snd_iprintf(buffer, "Effect Send Routing   : E=%i, F=%i, G=%i, H=%i\n",
+			    val1 & 0x3f,
+			    (val1 >> 8) & 0x3f,
+			    (val1 >> 16) & 0x3f,
+			    (val1 >> 24) & 0x3f);
 	} else {
 		snd_iprintf(buffer, "Effect Send Routing   : A=%i, B=%i, C=%i, D=%i\n",
 			    (val >> 16) & 0x0f,
author
#1 lore raw
Quoted 1 line · Lee Revell

This patch adds display of sends EFGH in the /proc file.

Disregard this patch. It has a stupid typo, and besides it turns out the display of EFX send routing in the /proc file was bogus to begin with. This is a per channel register, but it is only ever displayed for channel 0. Not very useful.

I will incorporate a fix for this into the per channel register dump patch.

Lee

-------------------------------------------------------
This SF.Net email is sponsored by: InterSystems CACHE FREE OODBMS DOWNLOAD - A multidimensional database that combines robust object and relational technologies, making it a perfect match for Java, C++,COM, XML, ODBC and JDBC. www.intersystems.com/match8