Changeset 470 for GPL/trunk/alsa-kernel

Timestamp:

Nov 6, 2009, 11:24:20 PM (16 years ago)

Author:

vladest

Message:

Fixed Uniaud API support. Please, take in account this diffs when making updates from ALSA tree for following files: pcm.c and pcm_lib.c

Location:

GPL/trunk/alsa-kernel/core

Files:

• pcm.c (modified) (8 diffs)
• pcm_lib.c (modified) (2 diffs)

GPL/trunk/alsa-kernel/core/pcm.c

@@ -156 +156 @@
                 {
                         int val;
-                        
+
                         if (get_user(val, (int __user *)arg))
                                 return -EFAULT;
@@ -177 +177 @@
 #define START(v) [SNDRV_PCM_START_##v] = #v
 #define FORMAT(v) [SNDRV_PCM_FORMAT_##v] = #v
-#define SUBFORMAT(v) [SNDRV_PCM_SUBFORMAT_##v] = #v 
+#define SUBFORMAT(v) [SNDRV_PCM_SUBFORMAT_##v] = #v
 
 static char *snd_pcm_format_names[] = {
@@ -242 +242 @@
 
 static char *snd_pcm_access_names[] = {
-        ACCESS(MMAP_INTERLEAVED), 
+        ACCESS(MMAP_INTERLEAVED),
         ACCESS(MMAP_NONINTERLEAVED),
         ACCESS(MMAP_COMPLEX),
@@ -250 +250 @@
 
 static char *snd_pcm_subformat_names[] = {
-        SUBFORMAT(STD), 
+        SUBFORMAT(STD),
 };
 
@@ -380 +380 @@
         snd_iprintf(buffer, "format: %s\n", snd_pcm_format_name(runtime->format));
         snd_iprintf(buffer, "subformat: %s\n", snd_pcm_subformat_name(runtime->subformat));
-        snd_iprintf(buffer, "channels: %u\n", runtime->channels);       
-        snd_iprintf(buffer, "rate: %u (%u/%u)\n", runtime->rate, runtime->rate_num, runtime->rate_den); 
-        snd_iprintf(buffer, "period_size: %lu\n", runtime->period_size);        
-        snd_iprintf(buffer, "buffer_size: %lu\n", runtime->buffer_size);        
+        snd_iprintf(buffer, "channels: %u\n", runtime->channels);
+        snd_iprintf(buffer, "rate: %u (%u/%u)\n", runtime->rate, runtime->rate_num, runtime->rate_den);
+        snd_iprintf(buffer, "period_size: %lu\n", runtime->period_size);
+        snd_iprintf(buffer, "buffer_size: %lu\n", runtime->buffer_size);
 #if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE)
         if (substream->oss.oss) {
                 snd_iprintf(buffer, "OSS format: %s\n", snd_pcm_oss_format_name(runtime->oss.format));
-                snd_iprintf(buffer, "OSS channels: %u\n", runtime->oss.channels);       
+                snd_iprintf(buffer, "OSS channels: %u\n", runtime->oss.channels);
                 snd_iprintf(buffer, "OSS rate: %u\n", runtime->oss.rate);
                 snd_iprintf(buffer, "OSS period bytes: %lu\n", (unsigned long)runtime->oss.period_bytes);
@@ -473 +473 @@
         char name[16];
 
-        sprintf(name, "pcm%i%c", pcm->device, 
+        sprintf(name, "pcm%i%c", pcm->device,
                 pstr->stream == SNDRV_PCM_STREAM_PLAYBACK ? 'p' : 'c');
         if ((entry = snd_info_create_card_entry(pcm->card, name, pcm->card->proc_root)) == NULL)
@@ -675 +675 @@
         }
         return 0;
-}                               
+}
 
 EXPORT_SYMBOL(snd_pcm_new_stream);
@@ -1132 +1132 @@
 void pcm_info(void)
 {
-        int idx;
-        struct snd_pcm *pcm;
-
-        down(&register_mutex);
-        for (idx = 0; idx < SNDRV_CARDS * SNDRV_PCM_DEVICES; idx++) {
-                pcm = snd_pcm_devices_os2[idx];
-                if (pcm == NULL)
-                        continue;
-                printk("%02i-%02i: %s : %s", idx / SNDRV_PCM_DEVICES,
-                           idx % SNDRV_PCM_DEVICES, pcm->id, pcm->name);
-                if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream)
-                        printk(" : playback %i", pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream_count);
-                if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream)
-                        printk(" : capture %i", pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream_count);
-                printk("\n");
-        }
-        up(&register_mutex);
-}
+    int idx = 0;
+    struct snd_pcm *pcm;
+
+    down(&register_mutex);
+    list_for_each_entry(pcm, &snd_pcm_devices, list, struct snd_pcm)
+    {
+        printk("%02i-%02i: %s : %s", pcm->card->number, pcm->device,
+               pcm->id, pcm->name);
+        if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream)
+            printk(" : playback %i", pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream_count);
+        if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream)
+            printk(" : capture %i", pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream_count);
+        printk("\n");
+        idx++;
+    }
+    up(&register_mutex);
+}
+
 /* get number of pcm instance s for given card */
 int pcm_instances(int card_id)
 {
-        int idx;
-        int pcms = 0;
-        struct snd_pcm *pcm;
-
-        down(&register_mutex);
-        for (idx = 0; idx < SNDRV_PCM_DEVICES; idx++) {
-                pcm = snd_pcm_devices_os2[(card_id*SNDRV_PCM_DEVICES)+idx];
-                if (pcm == NULL)
-                        continue;
-                pcms++;
-        }
-        up(&register_mutex);
-        return pcms;
+    int idx;
+    int pcms = 0;
+    struct snd_pcm *pcm;
+
+    down(&register_mutex);
+    list_for_each_entry(pcm, &snd_pcm_devices, list, struct snd_pcm) {
+        if (pcm->card->number == card_id)
+            pcms++;
+    }
+    up(&register_mutex);
+    return pcms;
 }
 

GPL/trunk/alsa-kernel/core/pcm_lib.c

@@ -30 +30 @@
 #include <sound/pcm_params.h>
 #include <sound/timer.h>
+
+/*
+ * Uniaud API support
+ */
+int uniaud_set_interrupted_substream(struct snd_pcm_substream *substream);
 
 /*
@@ -1650 +1655 @@
                 goto _end;
 
+        uniaud_set_interrupted_substream(substream);
+
         if (substream->timer_running)
                 snd_timer_interrupt(substream->timer, 1);