Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / include / sound / pcm-indirect.h

diff --git a/include/sound/pcm-indirect.h b/include/sound/pcm-indirect.h
index 31fa7a5..7003d77 100644 (file)
--- a/include/sound/pcm-indirect.h
+++ b/include/sound/pcm-indirect.h
@@ -24,7 +24,7 @@
 
 #include <sound/pcm.h>
 
-typedef struct sndrv_pcm_indirect {
+struct snd_pcm_indirect {
        unsigned int hw_buffer_size;    /* Byte size of hardware buffer */
        unsigned int hw_queue_size;     /* Max queue size of hw buffer (0 = buffer size) */
        unsigned int hw_data;   /* Offset to next dst (or src) in hw ring buffer */
@@ -35,20 +35,20 @@ typedef struct sndrv_pcm_indirect {
        unsigned int sw_io;     /* Current software pointer in bytes */
        int sw_ready;           /* Bytes ready to be transferred to/from hw */
        snd_pcm_uframes_t appl_ptr;     /* Last seen appl_ptr */
-} snd_pcm_indirect_t;
+};
 
-typedef void (*snd_pcm_indirect_copy_t)(snd_pcm_substream_t *substream,
-                                       snd_pcm_indirect_t *rec, size_t bytes);
+typedef void (*snd_pcm_indirect_copy_t)(struct snd_pcm_substream *substream,
+                                       struct snd_pcm_indirect *rec, size_t bytes);
 
 /*
  * helper function for playback ack callback
  */
 static inline void
-snd_pcm_indirect_playback_transfer(snd_pcm_substream_t *substream,
-                                  snd_pcm_indirect_t *rec,
+snd_pcm_indirect_playback_transfer(struct snd_pcm_substream *substream,
+                                  struct snd_pcm_indirect *rec,
                                   snd_pcm_indirect_copy_t copy)
 {
-       snd_pcm_runtime_t *runtime = substream->runtime;
+       struct snd_pcm_runtime *runtime = substream->runtime;
        snd_pcm_uframes_t appl_ptr = runtime->control->appl_ptr;
        snd_pcm_sframes_t diff = appl_ptr - rec->appl_ptr;
        int qsize;
@@ -89,8 +89,8 @@ snd_pcm_indirect_playback_transfer(snd_pcm_substream_t *substream,
  * ptr = current byte pointer
  */
 static inline snd_pcm_uframes_t
-snd_pcm_indirect_playback_pointer(snd_pcm_substream_t *substream,
-                                 snd_pcm_indirect_t *rec, unsigned int ptr)
+snd_pcm_indirect_playback_pointer(struct snd_pcm_substream *substream,
+                                 struct snd_pcm_indirect *rec, unsigned int ptr)
 {
        int bytes = ptr - rec->hw_io;
        if (bytes < 0)
@@ -110,11 +110,11 @@ snd_pcm_indirect_playback_pointer(snd_pcm_substream_t *substream,
  * helper function for capture ack callback
  */
 static inline void
-snd_pcm_indirect_capture_transfer(snd_pcm_substream_t *substream,
-                                 snd_pcm_indirect_t *rec,
+snd_pcm_indirect_capture_transfer(struct snd_pcm_substream *substream,
+                                 struct snd_pcm_indirect *rec,
                                  snd_pcm_indirect_copy_t copy)
 {
-       snd_pcm_runtime_t *runtime = substream->runtime;
+       struct snd_pcm_runtime *runtime = substream->runtime;
        snd_pcm_uframes_t appl_ptr = runtime->control->appl_ptr;
        snd_pcm_sframes_t diff = appl_ptr - rec->appl_ptr;
 
@@ -154,8 +154,8 @@ snd_pcm_indirect_capture_transfer(snd_pcm_substream_t *substream,
  * ptr = current byte pointer
  */
 static inline snd_pcm_uframes_t
-snd_pcm_indirect_capture_pointer(snd_pcm_substream_t *substream,
-                                snd_pcm_indirect_t *rec, unsigned int ptr)
+snd_pcm_indirect_capture_pointer(struct snd_pcm_substream *substream,
+                                struct snd_pcm_indirect *rec, unsigned int ptr)
 {
        int qsize;
        int bytes = ptr - rec->hw_io;