vserver 1.9.3

[linux-2.6.git] / sound / pci / emu10k1 / emuproc.c

diff --git a/sound/pci/emu10k1/emuproc.c b/sound/pci/emu10k1/emuproc.c
index 9582c31..994066c 100644 (file)
--- a/sound/pci/emu10k1/emuproc.c
+++ b/sound/pci/emu10k1/emuproc.c
@@ -71,31 +71,32 @@ static void snd_emu10k1_proc_spdif_status(emu10k1_t * emu,
 static void snd_emu10k1_proc_read(snd_info_entry_t *entry, 
                                  snd_info_buffer_t * buffer)
 {
-       static char *outputs[32] = {
-               /* 00 */ "PCM Left",
-               /* 01 */ "PCM Right",
-               /* 02 */ "PCM Surround Left",
-               /* 03 */ "PCM Surround Right",
-               /* 04 */ "MIDI Left",
-               /* 05 */ "MIDI Right",
-               /* 06 */ "PCM Center",
-               /* 07 */ "PCM LFE",
-               /* 08 */ "???",
-               /* 09 */ "???",
-               /* 10 */ "???",
-               /* 11 */ "???",
-               /* 12 */ "MIDI Reverb",
-               /* 13 */ "MIDI Chorus",
-               /* 14 */ "???",
+       /* FIXME - output names are in emufx.c too */
+       static char *creative_outs[32] = {
+               /* 00 */ "AC97 Left",
+               /* 01 */ "AC97 Right",
+               /* 02 */ "Optical IEC958 Left",
+               /* 03 */ "Optical IEC958 Right",
+               /* 04 */ "Center",
+               /* 05 */ "LFE",
+               /* 06 */ "Headphone Left",
+               /* 07 */ "Headphone Right",
+               /* 08 */ "Surround Left",
+               /* 09 */ "Surround Right",
+               /* 10 */ "PCM Capture Left",
+               /* 11 */ "PCM Capture Right",
+               /* 12 */ "MIC Capture",
+               /* 13 */ "AC97 Surround Left",
+               /* 14 */ "AC97 Surround Right",
                /* 15 */ "???",
                /* 16 */ "???",
-               /* 17 */ "???",
-               /* 18 */ "ADC Left / CDROM S/PDIF Left",
-               /* 19 */ "ADC Right / CDROM S/PDIF Right",
-               /* 20 */ "MIC / Zoom Video Left",
-               /* 21 */ "Zoom Video Right",
-               /* 22 */ "S/PDIF Left",
-               /* 23 */ "S/PDIF Right",
+               /* 17 */ "Analog Center",
+               /* 18 */ "Analog LFE",
+               /* 19 */ "???",
+               /* 20 */ "???",
+               /* 21 */ "???",
+               /* 22 */ "???",
+               /* 23 */ "???",
                /* 24 */ "???",
                /* 25 */ "???",
                /* 26 */ "???",
@@ -105,9 +106,78 @@ static void snd_emu10k1_proc_read(snd_info_entry_t *entry,
                /* 30 */ "???",
                /* 31 */ "???"
        };
-       emu10k1_t *emu = snd_magic_cast(emu10k1_t, entry->private_data, return);
+
+       static char *audigy_outs[64] = {
+               /* 00 */ "Digital Front Left",
+               /* 01 */ "Digital Front Right",
+               /* 02 */ "Digital Center",
+               /* 03 */ "Digital LEF",
+               /* 04 */ "Headphone Left",
+               /* 05 */ "Headphone Right",
+               /* 06 */ "Digital Rear Left",
+               /* 07 */ "Digital Rear Right",
+               /* 08 */ "Front Left",
+               /* 09 */ "Front Right",
+               /* 10 */ "Center",
+               /* 11 */ "LFE",
+               /* 12 */ "???",
+               /* 13 */ "???",
+               /* 14 */ "Rear Left",
+               /* 15 */ "Rear Right",
+               /* 16 */ "AC97 Front Left",
+               /* 17 */ "AC97 Front Right",
+               /* 18 */ "ADC Caputre Left",
+               /* 19 */ "ADC Capture Right",
+               /* 20 */ "???",
+               /* 21 */ "???",
+               /* 22 */ "???",
+               /* 23 */ "???",
+               /* 24 */ "???",
+               /* 25 */ "???",
+               /* 26 */ "???",
+               /* 27 */ "???",
+               /* 28 */ "???",
+               /* 29 */ "???",
+               /* 30 */ "???",
+               /* 31 */ "???",
+               /* 32 */ "???",
+               /* 33 */ "???",
+               /* 34 */ "???",
+               /* 35 */ "???",
+               /* 36 */ "???",
+               /* 37 */ "???",
+               /* 38 */ "???",
+               /* 39 */ "???",
+               /* 40 */ "???",
+               /* 41 */ "???",
+               /* 42 */ "???",
+               /* 43 */ "???",
+               /* 44 */ "???",
+               /* 45 */ "???",
+               /* 46 */ "???",
+               /* 47 */ "???",
+               /* 48 */ "???",
+               /* 49 */ "???",
+               /* 50 */ "???",
+               /* 51 */ "???",
+               /* 52 */ "???",
+               /* 53 */ "???",
+               /* 54 */ "???",
+               /* 55 */ "???",
+               /* 56 */ "???",
+               /* 57 */ "???",
+               /* 58 */ "???",
+               /* 59 */ "???",
+               /* 60 */ "???",
+               /* 61 */ "???",
+               /* 62 */ "???",
+               /* 33 */ "???"
+       };
+
+       emu10k1_t *emu = entry->private_data;
        unsigned int val;
        int nefx = emu->audigy ? 64 : 32;
+       char **outputs = emu->audigy ? audigy_outs : creative_outs;
        int idx;
        
        snd_iprintf(buffer, "EMU10K1\n\n");
@@ -117,7 +187,7 @@ static void snd_emu10k1_proc_read(snd_info_entry_t *entry,
        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);
-       snd_iprintf(buffer, "External TRAM (words) : 0x%x\n", emu->fx8010.etram_pages.bytes);
+       snd_iprintf(buffer, "External TRAM (words) : 0x%x\n", (int)emu->fx8010.etram_pages.bytes);
        snd_iprintf(buffer, "\n");
        if (emu->audigy) {
                snd_iprintf(buffer, "Effect Send Routing   : A=%i, B=%i, C=%i, D=%i\n",
@@ -135,7 +205,7 @@ static void snd_emu10k1_proc_read(snd_info_entry_t *entry,
        snd_iprintf(buffer, "\nCaptured FX Outputs   :\n");
        for (idx = 0; idx < nefx; idx++) {
                if (emu->efx_voices_mask[idx/32] & (1 << (idx%32)))
-                       snd_iprintf(buffer, "  Output %02i [%s]\n", idx, outputs[idx%32]);
+                       snd_iprintf(buffer, "  Output %02i [%s]\n", idx, outputs[idx]);
        }
        snd_iprintf(buffer, "\nAll FX Outputs        :\n");
        for (idx = 0; idx < 32; idx++)
@@ -155,7 +225,7 @@ static void snd_emu10k1_proc_acode_read(snd_info_entry_t *entry,
                                        snd_info_buffer_t * buffer)
 {
        u32 pc;
-       emu10k1_t *emu = snd_magic_cast(emu10k1_t, entry->private_data, return);
+       emu10k1_t *emu = entry->private_data;
 
        snd_iprintf(buffer, "FX8010 Instruction List '%s'\n", emu->fx8010.name);
        snd_iprintf(buffer, "  Code dump      :\n");
@@ -195,7 +265,7 @@ static long snd_emu10k1_fx8010_read(snd_info_entry_t *entry, void *file_private_
                                    unsigned long count, unsigned long pos)
 {
        long size;
-       emu10k1_t *emu = snd_magic_cast(emu10k1_t, entry->private_data, return -ENXIO);
+       emu10k1_t *emu = entry->private_data;
        unsigned int offset;
        
        if (!strcmp(entry->name, "fx8010_tram_addr")) {