Changeset 587 for GPL/trunk/alsa-kernel/include/sound/pcm.h

Timestamp:

Jun 9, 2016, 10:38:13 PM (9 years ago)

Author:

David Azarewicz

Message:

Rearrange directory structure
rework makefiles
cleanup files

File:

• GPL/trunk/alsa-kernel/include/sound/pcm.h (modified) (9 diffs)

GPL/trunk/alsa-kernel/include/sound/pcm.h

@@ -74 +74 @@
                     snd_pcm_uframes_t pos,
                     void __user *buf, snd_pcm_uframes_t count);
-        int (*silence)(struct snd_pcm_substream *substream, int channel, 
+        int (*silence)(struct snd_pcm_substream *substream, int channel,
                        snd_pcm_uframes_t pos, snd_pcm_uframes_t count);
         struct page *(*page)(struct snd_pcm_substream *substream,
@@ -216 +216 @@
 
 struct snd_pcm_hw_constraints {
-        struct snd_mask masks[SNDRV_PCM_HW_PARAM_LAST_MASK - 
+        struct snd_mask masks[SNDRV_PCM_HW_PARAM_LAST_MASK -
                          SNDRV_PCM_HW_PARAM_FIRST_MASK + 1];
         struct snd_interval intervals[SNDRV_PCM_HW_PARAM_LAST_INTERVAL -
@@ -330 +330 @@
         int tstamp_type;                /* timestamp type */
 
-        /* -- DMA -- */           
+        /* -- DMA -- */
         unsigned char *dma_area;        /* DMA area */
         dma_addr_t dma_addr;            /* physical bus address (not accessible from main CPU) */
@@ -538 +538 @@
 } while (0)
 
+#ifdef TARGET_OS2
 #define snd_pcm_group_for_each_entry(s, substream) \
         list_for_each_entry(s, &substream->group->substreams, link_list, struct snd_pcm_substream)
+#else   
+#define snd_pcm_group_for_each_entry(s, substream) \
+        list_for_each_entry(s, &substream->group->substreams, link_list)
+#endif
 
 static inline int snd_pcm_running(struct snd_pcm_substream *substream)
@@ -592 +597 @@
         snd_pcm_sframes_t avail = runtime->status->hw_ptr + runtime->buffer_size - runtime->control->appl_ptr;
 #if defined TARGET_OS2
-       if ( runtime->buffer_size > runtime->control->appl_ptr) 
-          avail = runtime->status->hw_ptr + runtime->buffer_size - runtime->control->appl_ptr; 
-       else 
-       { 
- 
-          avail = runtime->control->appl_ptr - runtime->status->hw_ptr; 
-          if ( avail > runtime->buffer_size ) 
-             avail = 0; 
-          else 
-             avail = runtime->buffer_size - avail; 
-       } 
-#endif /* TARGET_OS2  */ 
+       if ( runtime->buffer_size > runtime->control->appl_ptr)
+          avail = runtime->status->hw_ptr + runtime->buffer_size - runtime->control->appl_ptr;
+       else
+       {
+
+          avail = runtime->control->appl_ptr - runtime->status->hw_ptr;
+          if ( avail > runtime->buffer_size )
+             avail = 0;
+          else
+             avail = runtime->buffer_size - avail;
+       }
+#endif /* TARGET_OS2  */
         if (avail < 0)
                 avail += runtime->boundary;
@@ -706 +711 @@
 }
 
-static inline void snd_pcm_trigger_done(struct snd_pcm_substream *substream, 
+static inline void snd_pcm_trigger_done(struct snd_pcm_substream *substream,
                                         struct snd_pcm_substream *master)
 {
@@ -763 +768 @@
 void snd_interval_mul(const struct snd_interval *a, const struct snd_interval *b, struct snd_interval *c);
 void snd_interval_div(const struct snd_interval *a, const struct snd_interval *b, struct snd_interval *c);
-void snd_interval_muldivk(const struct snd_interval *a, const struct snd_interval *b, 
+void snd_interval_muldivk(const struct snd_interval *a, const struct snd_interval *b,
                           unsigned int k, struct snd_interval *c);
 void snd_interval_mulkdiv(const struct snd_interval *a, unsigned int k,
@@ -788 +793 @@
                                  unsigned int min, unsigned int max);
 int snd_pcm_hw_constraint_integer(struct snd_pcm_runtime *runtime, snd_pcm_hw_param_t var);
-int snd_pcm_hw_constraint_list(struct snd_pcm_runtime *runtime, 
+int snd_pcm_hw_constraint_list(struct snd_pcm_runtime *runtime,
                                unsigned int cond,
                                snd_pcm_hw_param_t var,
                                struct snd_pcm_hw_constraint_list *l);
-int snd_pcm_hw_constraint_ratnums(struct snd_pcm_runtime *runtime, 
+int snd_pcm_hw_constraint_ratnums(struct snd_pcm_runtime *runtime,
                                   unsigned int cond,
                                   snd_pcm_hw_param_t var,
                                   struct snd_pcm_hw_constraint_ratnums *r);
-int snd_pcm_hw_constraint_ratdens(struct snd_pcm_runtime *runtime, 
+int snd_pcm_hw_constraint_ratdens(struct snd_pcm_runtime *runtime,
                                   unsigned int cond,
                                   snd_pcm_hw_param_t var,
                                   struct snd_pcm_hw_constraint_ratdens *r);
-int snd_pcm_hw_constraint_msbits(struct snd_pcm_runtime *runtime, 
+int snd_pcm_hw_constraint_msbits(struct snd_pcm_runtime *runtime,
                                  unsigned int cond,
                                  unsigned int width,
@@ -848 +853 @@
 int snd_pcm_lib_interleave_len(struct snd_pcm_substream *substream);
 int snd_pcm_lib_ioctl(struct snd_pcm_substream *substream,
-                      unsigned int cmd, void *arg);                      
+                      unsigned int cmd, void *arg);
 int snd_pcm_update_hw_ptr(struct snd_pcm_substream *substream);
 int snd_pcm_playback_xrun_check(struct snd_pcm_substream *substream);