Changeset 34 for GPL/trunk/alsa-kernel/pci/emu10k1/emuproc.c

Timestamp:

Dec 11, 2005, 5:57:39 PM (20 years ago)

Author:

vladest

Message:

Latest update from ALSA. some intial > 15 interrupts support

File:

• GPL/trunk/alsa-kernel/pci/emu10k1/emuproc.c (modified) (13 diffs)

GPL/trunk/alsa-kernel/pci/emu10k1/emuproc.c

@@ -32 +32 @@
 #include <sound/emu10k1.h>
 
-static void snd_emu10k1_proc_spdif_status(emu10k1_t * emu,
+static void snd_emu10k1_proc_spdif_status(struct snd_emu10k1 * emu,
                                           snd_info_buffer_t * buffer,
                                           char *title,
@@ -175 +175 @@
     };
 
-    emu10k1_t *emu = entry->private_data;
+    struct snd_emu10k1 *emu = entry->private_data;
     unsigned int val;
     int nefx = emu->audigy ? 64 : 32;
@@ -223 +223 @@
 {
     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);
@@ -267 +267 @@
 {
     long size;
-    emu10k1_t *emu = entry->private_data;
+    struct snd_emu10k1 *emu = entry->private_data;
     unsigned int offset;
     int tram_addr = 0;
@@ -310 +310 @@
                                          snd_info_buffer_t * 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;
 
@@ -331 +331 @@
                                      snd_info_buffer_t * buffer)
 {
-    emu10k1_t *emu = entry->private_data;
+    struct snd_emu10k1 *emu = entry->private_data;
     unsigned long value;
     unsigned long flags;
@@ -347 +347 @@
                                       snd_info_buffer_t * buffer)
 {
-    emu10k1_t *emu = entry->private_data;
+    struct snd_emu10k1 *emu = entry->private_data;
     unsigned long flags;
     char line[64];
     u32 reg, val;
+#if 0
     while (!snd_info_get_line(buffer, line, sizeof(line))) {
         if (sscanf(line, "%x %x", &reg, &val) != 2)
@@ -360 +361 @@
         }
     }
-}
-
-static unsigned int snd_ptr_read(emu10k1_t * emu,
+#endif
+}
+
+static unsigned int snd_ptr_read(struct snd_emu10k1 * emu,
                                  unsigned int iobase,
                                  unsigned int reg,
@@ -379 +381 @@
 }
 
-static void snd_ptr_write(emu10k1_t *emu,
+static void snd_ptr_write(struct snd_emu10k1 *emu,
                           unsigned int iobase,
                           unsigned int reg,
@@ -400 +402 @@
                                       snd_info_buffer_t * buffer, int iobase, int offset, int length)
 {
-    emu10k1_t *emu = entry->private_data;
+    struct snd_emu10k1 *emu = entry->private_data;
     unsigned long value;
     int i,j;
@@ -424 +426 @@
                                        snd_info_buffer_t * 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;
+#if 0
     while (!snd_info_get_line(buffer, line, sizeof(line))) {
         if (sscanf(line, "%x %x %x", &reg, &channel_id, &val) != 3)
@@ -433 +436 @@
             snd_ptr_write(emu, iobase, reg, channel_id, val);
     }
+#endif
 }
 
@@ -483 +487 @@
 };
 #endif
-int __devinit snd_emu10k1_proc_init(emu10k1_t * emu)
+int __devinit snd_emu10k1_proc_init(struct snd_emu10k1 * emu)
 {
     snd_info_entry_t *entry;