This commit was manufactured by cvs2svn to create tag

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

diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index c780e10..888e322 100644 (file)
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -364,6 +364,7 @@ struct _snd_pcm_runtime {
 typedef struct _snd_pcm_group {                /* keep linked substreams */
        spinlock_t lock;
        struct list_head substreams;
+       int count;
 } snd_pcm_group_t;
 
 struct _snd_pcm_substream {
@@ -405,6 +406,8 @@ struct _snd_pcm_substream {
        snd_info_entry_t *proc_sw_params_entry;
        snd_info_entry_t *proc_status_entry;
        snd_info_entry_t *proc_prealloc_entry;
+       /* misc flags */
+       unsigned int no_mmap_ctrl: 1;
 };
 
 #if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE)
@@ -486,6 +489,7 @@ int snd_pcm_status(snd_pcm_substream_t * substream, snd_pcm_status_t *status);
 int snd_pcm_prepare(snd_pcm_substream_t *substream);
 int snd_pcm_start(snd_pcm_substream_t *substream);
 int snd_pcm_stop(snd_pcm_substream_t *substream, int status);
+int snd_pcm_drain_done(snd_pcm_substream_t *substream);
 #ifdef CONFIG_PM
 int snd_pcm_suspend(snd_pcm_substream_t *substream);
 int snd_pcm_suspend_all(snd_pcm_t *pcm);