]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - sound/pci/emu10k1/emuproc.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
[linux-2.6-omap-h63xx.git] / sound / pci / emu10k1 / emuproc.c
index cc22707c91fae86b4cda85809c250311b7c97269..c3fb10e81c9e0d4e6e52359ce3f27bc066494ea3 100644 (file)
@@ -1,8 +1,11 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *                   Creative Labs, Inc.
  *  Routines for control of EMU10K1 chips / proc interface routines
  *
+ *  Copyright (c) by James Courtier-Dutton <James@superbug.co.uk>
+ *     Added EMU 1010 support.
+ *
  *  BUGS:
  *    --
  *
@@ -32,8 +35,9 @@
 #include <sound/emu10k1.h>
 #include "p16v.h"
 
-static void snd_emu10k1_proc_spdif_status(emu10k1_t * emu,
-                                         snd_info_buffer_t * buffer,
+#ifdef CONFIG_PROC_FS
+static void snd_emu10k1_proc_spdif_status(struct snd_emu10k1 * emu,
+                                         struct snd_info_buffer *buffer,
                                          char *title,
                                          int status_reg,
                                          int rate_reg)
@@ -75,8 +79,8 @@ 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 void snd_emu10k1_proc_read(struct snd_info_entry *entry, 
+                                 struct snd_info_buffer *buffer)
 {
        /* FIXME - output names are in emufx.c too */
        static char *creative_outs[32] = {
@@ -181,7 +185,7 @@ static void snd_emu10k1_proc_read(snd_info_entry_t *entry,
                /* 63 */ "FXBUS2_31"
        };
 
-       emu10k1_t *emu = entry->private_data;
+       struct snd_emu10k1 *emu = entry->private_data;
        unsigned int val, val1;
        int nefx = emu->audigy ? 64 : 32;
        char **outputs = emu->audigy ? audigy_outs : creative_outs;
@@ -232,12 +236,46 @@ static void snd_emu10k1_proc_read(snd_info_entry_t *entry,
                snd_iprintf(buffer, "  Output %02i [%s]\n", idx, outputs[idx]);
 }
 
-static void snd_emu10k1_proc_spdif_read(snd_info_entry_t *entry, 
-                                 snd_info_buffer_t * buffer)
+static void snd_emu10k1_proc_spdif_read(struct snd_info_entry *entry, 
+                                 struct snd_info_buffer *buffer)
 {
-       emu10k1_t *emu = entry->private_data;
-       snd_emu10k1_proc_spdif_status(emu, buffer, "CD-ROM S/PDIF In", CDCS, CDSRCS);
-       snd_emu10k1_proc_spdif_status(emu, buffer, "Optical or Coax S/PDIF In", GPSCS, GPSRCS);
+       struct snd_emu10k1 *emu = entry->private_data;
+       u32 value;
+       u32 value2;
+       unsigned long flags;
+       u32 rate;
+
+       if (emu->card_capabilities->emu1010) {
+               spin_lock_irqsave(&emu->emu_lock, flags);
+               snd_emu1010_fpga_read(emu, 0x38, &value);
+               spin_unlock_irqrestore(&emu->emu_lock, flags);
+               if ((value & 0x1) == 0) {
+                       spin_lock_irqsave(&emu->emu_lock, flags);
+                       snd_emu1010_fpga_read(emu, 0x2a, &value);
+                       snd_emu1010_fpga_read(emu, 0x2b, &value2);
+                       spin_unlock_irqrestore(&emu->emu_lock, flags);
+                       rate = 0x1770000 / (((value << 5) | value2)+1); 
+                       snd_iprintf(buffer, "ADAT Locked : %u\n", rate);
+               } else {
+                       snd_iprintf(buffer, "ADAT Unlocked\n");
+               }
+               spin_lock_irqsave(&emu->emu_lock, flags);
+               snd_emu1010_fpga_read(emu, 0x20, &value);
+               spin_unlock_irqrestore(&emu->emu_lock, flags);
+               if ((value & 0x4) == 0) {
+                       spin_lock_irqsave(&emu->emu_lock, flags);
+                       snd_emu1010_fpga_read(emu, 0x28, &value);
+                       snd_emu1010_fpga_read(emu, 0x29, &value2);
+                       spin_unlock_irqrestore(&emu->emu_lock, flags);
+                       rate = 0x1770000 / (((value << 5) | value2)+1); 
+                       snd_iprintf(buffer, "SPDIF Locked : %d\n", rate);
+               } else {
+                       snd_iprintf(buffer, "SPDIF Unlocked\n");
+               }
+       } else {
+               snd_emu10k1_proc_spdif_status(emu, buffer, "CD-ROM S/PDIF In", CDCS, CDSRCS);
+               snd_emu10k1_proc_spdif_status(emu, buffer, "Optical or Coax S/PDIF In", GPSCS, GPSRCS);
+       }
 #if 0
        val = snd_emu10k1_ptr_read(emu, ZVSRCS, 0);
        snd_iprintf(buffer, "\nZoomed Video\n");
@@ -246,26 +284,26 @@ static void snd_emu10k1_proc_spdif_read(snd_info_entry_t *entry,
 #endif
 }
 
-static void snd_emu10k1_proc_rates_read(snd_info_entry_t *entry, 
-                                 snd_info_buffer_t * buffer)
+static void snd_emu10k1_proc_rates_read(struct snd_info_entry *entry, 
+                                 struct snd_info_buffer *buffer)
 {
        static int samplerate[8] = { 44100, 48000, 96000, 192000, 4, 5, 6, 7 };
-       emu10k1_t *emu = entry->private_data;
+       struct snd_emu10k1 *emu = entry->private_data;
        unsigned int val, tmp, n;
        val = snd_emu10k1_ptr20_read(emu, CAPTURE_RATE_STATUS, 0);
        tmp = (val >> 16) & 0x8;
-       for (n=0;n<4;n++) {
+       for (n = 0; n < 4; n++) {
                tmp = val >> (16 + (n*4));
                if (tmp & 0x8) snd_iprintf(buffer, "Channel %d: Rate=%d\n", n, samplerate[tmp & 0x7]);
                else snd_iprintf(buffer, "Channel %d: No input\n", n);
        }
 }
 
-static void snd_emu10k1_proc_acode_read(snd_info_entry_t *entry, 
-                                       snd_info_buffer_t * buffer)
+static void snd_emu10k1_proc_acode_read(struct snd_info_entry *entry, 
+                                       struct snd_info_buffer *buffer)
 {
        u32 pc;
-       emu10k1_t *emu = entry->private_data;
+       struct snd_emu10k1 *emu = entry->private_data;
 
        snd_iprintf(buffer, "FX8010 Instruction List '%s'\n", emu->fx8010.name);
        snd_iprintf(buffer, "  Code dump      :\n");
@@ -304,12 +342,13 @@ static void snd_emu10k1_proc_acode_read(snd_info_entry_t *entry,
 #define TOTAL_SIZE_CODE                (0x200*8)
 #define A_TOTAL_SIZE_CODE      (0x400*8)
 
-static long snd_emu10k1_fx8010_read(snd_info_entry_t *entry, void *file_private_data,
+static long snd_emu10k1_fx8010_read(struct snd_info_entry *entry,
+                                   void *file_private_data,
                                    struct file *file, char __user *buf,
                                    unsigned long count, unsigned long pos)
 {
        long size;
-       emu10k1_t *emu = entry->private_data;
+       struct snd_emu10k1 *emu = entry->private_data;
        unsigned int offset;
        int tram_addr = 0;
        
@@ -349,11 +388,11 @@ static long snd_emu10k1_fx8010_read(snd_info_entry_t *entry, void *file_private_
        return 0;
 }
 
-static void snd_emu10k1_proc_voices_read(snd_info_entry_t *entry, 
-                                 snd_info_buffer_t * buffer)
+static void snd_emu10k1_proc_voices_read(struct snd_info_entry *entry, 
+                                 struct snd_info_buffer *buffer)
 {
-       emu10k1_t *emu = entry->private_data;
-       emu10k1_voice_t *voice;
+       struct snd_emu10k1 *emu = entry->private_data;
+       struct snd_emu10k1_voice *voice;
        int idx;
        
        snd_iprintf(buffer, "ch\tuse\tpcm\tefx\tsynth\tmidi\n");
@@ -370,10 +409,27 @@ static void snd_emu10k1_proc_voices_read(snd_info_entry_t *entry,
 }
 
 #ifdef CONFIG_SND_DEBUG
-static void snd_emu_proc_io_reg_read(snd_info_entry_t *entry,
-                                    snd_info_buffer_t * buffer)
+static void snd_emu_proc_emu1010_reg_read(struct snd_info_entry *entry,
+                                    struct snd_info_buffer *buffer)
 {
-       emu10k1_t *emu = entry->private_data;
+       struct snd_emu10k1 *emu = entry->private_data;
+       int value;
+       unsigned long flags;
+       int i;
+       snd_iprintf(buffer, "EMU1010 Registers:\n\n");
+
+       for(i = 0; i < 0x40; i+=1) {
+               spin_lock_irqsave(&emu->emu_lock, flags);
+               snd_emu1010_fpga_read(emu, i, &value);
+               spin_unlock_irqrestore(&emu->emu_lock, flags);
+               snd_iprintf(buffer, "%02X: %08X, %02X\n", i, value, (value >> 8) & 0x7f);
+       }
+}
+
+static void snd_emu_proc_io_reg_read(struct snd_info_entry *entry,
+                                    struct snd_info_buffer *buffer)
+{
+       struct snd_emu10k1 *emu = entry->private_data;
        unsigned long value;
        unsigned long flags;
        int i;
@@ -386,17 +442,17 @@ static void snd_emu_proc_io_reg_read(snd_info_entry_t *entry,
        }
 }
 
-static void snd_emu_proc_io_reg_write(snd_info_entry_t *entry,
-                                      snd_info_buffer_t * buffer)
+static void snd_emu_proc_io_reg_write(struct snd_info_entry *entry,
+                                      struct snd_info_buffer *buffer)
 {
-       emu10k1_t *emu = entry->private_data;
+       struct snd_emu10k1 *emu = entry->private_data;
        unsigned long flags;
        char line[64];
        u32 reg, val;
        while (!snd_info_get_line(buffer, line, sizeof(line))) {
                if (sscanf(line, "%x %x", &reg, &val) != 2)
                        continue;
-               if ((reg < 0x40) && (reg >=0) && (val <= 0xffffffff) ) {
+               if ((reg < 0x40) && (reg >= 0) && (val <= 0xffffffff) ) {
                        spin_lock_irqsave(&emu->emu_lock, flags);
                        outl(val, emu->port + (reg & 0xfffffffc));
                        spin_unlock_irqrestore(&emu->emu_lock, flags);
@@ -404,7 +460,7 @@ static void snd_emu_proc_io_reg_write(snd_info_entry_t *entry,
        }
 }
 
-static unsigned int snd_ptr_read(emu10k1_t * emu,
+static unsigned int snd_ptr_read(struct snd_emu10k1 * emu,
                                 unsigned int iobase,
                                 unsigned int reg,
                                 unsigned int chn)
@@ -421,7 +477,7 @@ static unsigned int snd_ptr_read(emu10k1_t * emu,
        return val;
 }
 
-static void snd_ptr_write(emu10k1_t *emu,
+static void snd_ptr_write(struct snd_emu10k1 *emu,
                          unsigned int iobase,
                          unsigned int reg,
                          unsigned int chn,
@@ -439,13 +495,13 @@ static void snd_ptr_write(emu10k1_t *emu,
 }
 
 
-static void snd_emu_proc_ptr_reg_read(snd_info_entry_t *entry,
-                                     snd_info_buffer_t * buffer, int iobase, int offset, int length, int voices)
+static void snd_emu_proc_ptr_reg_read(struct snd_info_entry *entry,
+                                     struct snd_info_buffer *buffer, int iobase, int offset, int length, int voices)
 {
-       emu10k1_t *emu = entry->private_data;
+       struct snd_emu10k1 *emu = entry->private_data;
        unsigned long value;
        int i,j;
-       if (offset+length > 0x80) {
+       if (offset+length > 0xa0) {
                snd_iprintf(buffer, "Input values out of range\n");
                return;
        }
@@ -463,112 +519,122 @@ static void snd_emu_proc_ptr_reg_read(snd_info_entry_t *entry,
        }
 }
 
-static void snd_emu_proc_ptr_reg_write(snd_info_entry_t *entry,
-                                      snd_info_buffer_t * buffer, int iobase)
+static void snd_emu_proc_ptr_reg_write(struct snd_info_entry *entry,
+                                      struct snd_info_buffer *buffer, int iobase)
 {
-       emu10k1_t *emu = entry->private_data;
+       struct snd_emu10k1 *emu = entry->private_data;
        char line[64];
        unsigned int reg, channel_id , val;
        while (!snd_info_get_line(buffer, line, sizeof(line))) {
                if (sscanf(line, "%x %x %x", &reg, &channel_id, &val) != 3)
                        continue;
-               if ((reg < 0x80) && (reg >=0) && (val <= 0xffffffff) && (channel_id >=0) && (channel_id <= 3) )
+               if ((reg < 0xa0) && (reg >= 0) && (val <= 0xffffffff) && (channel_id >= 0) && (channel_id <= 3) )
                        snd_ptr_write(emu, iobase, reg, channel_id, val);
        }
 }
 
-static void snd_emu_proc_ptr_reg_write00(snd_info_entry_t *entry,
-                                        snd_info_buffer_t * buffer)
+static void snd_emu_proc_ptr_reg_write00(struct snd_info_entry *entry,
+                                        struct snd_info_buffer *buffer)
 {
        snd_emu_proc_ptr_reg_write(entry, buffer, 0);
 }
 
-static void snd_emu_proc_ptr_reg_write20(snd_info_entry_t *entry,
-                                        snd_info_buffer_t * buffer)
+static void snd_emu_proc_ptr_reg_write20(struct snd_info_entry *entry,
+                                        struct snd_info_buffer *buffer)
 {
        snd_emu_proc_ptr_reg_write(entry, buffer, 0x20);
 }
        
 
-static void snd_emu_proc_ptr_reg_read00a(snd_info_entry_t *entry,
-                                        snd_info_buffer_t * buffer)
+static void snd_emu_proc_ptr_reg_read00a(struct snd_info_entry *entry,
+                                        struct snd_info_buffer *buffer)
 {
        snd_emu_proc_ptr_reg_read(entry, buffer, 0, 0, 0x40, 64);
 }
 
-static void snd_emu_proc_ptr_reg_read00b(snd_info_entry_t *entry,
-                                        snd_info_buffer_t * buffer)
+static void snd_emu_proc_ptr_reg_read00b(struct snd_info_entry *entry,
+                                        struct snd_info_buffer *buffer)
 {
        snd_emu_proc_ptr_reg_read(entry, buffer, 0, 0x40, 0x40, 64);
 }
 
-static void snd_emu_proc_ptr_reg_read20a(snd_info_entry_t *entry,
-                                        snd_info_buffer_t * buffer)
+static void snd_emu_proc_ptr_reg_read20a(struct snd_info_entry *entry,
+                                        struct snd_info_buffer *buffer)
 {
        snd_emu_proc_ptr_reg_read(entry, buffer, 0x20, 0, 0x40, 4);
 }
 
-static void snd_emu_proc_ptr_reg_read20b(snd_info_entry_t *entry,
-                                        snd_info_buffer_t * buffer)
+static void snd_emu_proc_ptr_reg_read20b(struct snd_info_entry *entry,
+                                        struct snd_info_buffer *buffer)
 {
        snd_emu_proc_ptr_reg_read(entry, buffer, 0x20, 0x40, 0x40, 4);
 }
+
+static void snd_emu_proc_ptr_reg_read20c(struct snd_info_entry *entry,
+                                        struct snd_info_buffer * buffer)
+{
+       snd_emu_proc_ptr_reg_read(entry, buffer, 0x20, 0x80, 0x20, 4);
+}
 #endif
 
 static struct snd_info_entry_ops snd_emu10k1_proc_ops_fx8010 = {
        .read = snd_emu10k1_fx8010_read,
 };
 
-int __devinit snd_emu10k1_proc_init(emu10k1_t * emu)
+int __devinit snd_emu10k1_proc_init(struct snd_emu10k1 * emu)
 {
-       snd_info_entry_t *entry;
+       struct snd_info_entry *entry;
 #ifdef CONFIG_SND_DEBUG
+       if (emu->card_capabilities->emu1010) {
+               if (! snd_card_proc_new(emu->card, "emu1010_regs", &entry)) 
+                       snd_info_set_text_ops(entry, emu, snd_emu_proc_emu1010_reg_read);
+       }
        if (! snd_card_proc_new(emu->card, "io_regs", &entry)) {
-               snd_info_set_text_ops(entry, emu, 1024, snd_emu_proc_io_reg_read);
-               entry->c.text.write_size = 64;
+               snd_info_set_text_ops(entry, emu, snd_emu_proc_io_reg_read);
                entry->c.text.write = snd_emu_proc_io_reg_write;
                entry->mode |= S_IWUSR;
        }
        if (! snd_card_proc_new(emu->card, "ptr_regs00a", &entry)) {
-               snd_info_set_text_ops(entry, emu, 65536, snd_emu_proc_ptr_reg_read00a);
-               entry->c.text.write_size = 64;
+               snd_info_set_text_ops(entry, emu, snd_emu_proc_ptr_reg_read00a);
                entry->c.text.write = snd_emu_proc_ptr_reg_write00;
                entry->mode |= S_IWUSR;
        }
        if (! snd_card_proc_new(emu->card, "ptr_regs00b", &entry)) {
-               snd_info_set_text_ops(entry, emu, 65536, snd_emu_proc_ptr_reg_read00b);
-               entry->c.text.write_size = 64;
+               snd_info_set_text_ops(entry, emu, snd_emu_proc_ptr_reg_read00b);
                entry->c.text.write = snd_emu_proc_ptr_reg_write00;
                entry->mode |= S_IWUSR;
        }
        if (! snd_card_proc_new(emu->card, "ptr_regs20a", &entry)) {
-               snd_info_set_text_ops(entry, emu, 65536, snd_emu_proc_ptr_reg_read20a);
-               entry->c.text.write_size = 64;
+               snd_info_set_text_ops(entry, emu, snd_emu_proc_ptr_reg_read20a);
                entry->c.text.write = snd_emu_proc_ptr_reg_write20;
                entry->mode |= S_IWUSR;
        }
        if (! snd_card_proc_new(emu->card, "ptr_regs20b", &entry)) {
-               snd_info_set_text_ops(entry, emu, 65536, snd_emu_proc_ptr_reg_read20b);
-               entry->c.text.write_size = 64;
+               snd_info_set_text_ops(entry, emu, snd_emu_proc_ptr_reg_read20b);
+               entry->c.text.write = snd_emu_proc_ptr_reg_write20;
+               entry->mode |= S_IWUSR;
+       }
+       if (! snd_card_proc_new(emu->card, "ptr_regs20c", &entry)) {
+               snd_info_set_text_ops(entry, emu, snd_emu_proc_ptr_reg_read20c);
                entry->c.text.write = snd_emu_proc_ptr_reg_write20;
                entry->mode |= S_IWUSR;
        }
 #endif
        
        if (! snd_card_proc_new(emu->card, "emu10k1", &entry))
-               snd_info_set_text_ops(entry, emu, 2048, snd_emu10k1_proc_read);
+               snd_info_set_text_ops(entry, emu, snd_emu10k1_proc_read);
 
        if (emu->card_capabilities->emu10k2_chip) {
                if (! snd_card_proc_new(emu->card, "spdif-in", &entry))
-                       snd_info_set_text_ops(entry, emu, 2048, snd_emu10k1_proc_spdif_read);
+                       snd_info_set_text_ops(entry, emu, snd_emu10k1_proc_spdif_read);
        }
        if (emu->card_capabilities->ca0151_chip) {
                if (! snd_card_proc_new(emu->card, "capture-rates", &entry))
-                       snd_info_set_text_ops(entry, emu, 2048, snd_emu10k1_proc_rates_read);
+                       snd_info_set_text_ops(entry, emu, snd_emu10k1_proc_rates_read);
        }
 
        if (! snd_card_proc_new(emu->card, "voices", &entry))
-               snd_info_set_text_ops(entry, emu, 2048, snd_emu10k1_proc_voices_read);
+               snd_info_set_text_ops(entry, emu, snd_emu10k1_proc_voices_read);
 
        if (! snd_card_proc_new(emu->card, "fx8010_gpr", &entry)) {
                entry->content = SNDRV_INFO_CONTENT_DATA;
@@ -602,8 +668,8 @@ int __devinit snd_emu10k1_proc_init(emu10k1_t * emu)
                entry->content = SNDRV_INFO_CONTENT_TEXT;
                entry->private_data = emu;
                entry->mode = S_IFREG | S_IRUGO /*| S_IWUSR*/;
-               entry->c.text.read_size = 128*1024;
                entry->c.text.read = snd_emu10k1_proc_acode_read;
        }
        return 0;
 }
+#endif /* CONFIG_PROC_FS */