git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
sound
/
pcm.h
diff --git
a/include/sound/pcm.h
b/include/sound/pcm.h
index
f84d849
..
2f645df
100644
(file)
--- a/
include/sound/pcm.h
+++ b/
include/sound/pcm.h
@@
-26,6
+26,7
@@
#include <sound/asound.h>
#include <sound/memalloc.h>
#include <linux/poll.h>
#include <sound/asound.h>
#include <sound/memalloc.h>
#include <linux/poll.h>
+#include <linux/mm.h>
#include <linux/bitops.h>
#define snd_pcm_substream_chip(substream) ((substream)->private_data)
#include <linux/bitops.h>
#define snd_pcm_substream_chip(substream) ((substream)->private_data)
@@
-190,7
+191,7
@@
struct snd_pcm_ops {
struct snd_pcm_file {
struct snd_pcm_substream *substream;
struct snd_pcm_file {
struct snd_pcm_substream *substream;
-
struct snd_pcm_file *next
;
+
int no_compat_mmap
;
};
struct snd_pcm_hw_rule;
};
struct snd_pcm_hw_rule;
@@
-347,6
+348,7
@@
struct snd_pcm_substream {
int number;
char name[32]; /* substream name */
int stream; /* stream (direction) */
int number;
char name[32]; /* substream name */
int stream; /* stream (direction) */
+ char latency_id[20]; /* latency identifier */
size_t buffer_bytes_max; /* limit ring buffer size */
struct snd_dma_buffer dma_buffer;
unsigned int dma_buf_id;
size_t buffer_bytes_max; /* limit ring buffer size */
struct snd_dma_buffer dma_buffer;
unsigned int dma_buf_id;
@@
-384,7
+386,6
@@
struct snd_pcm_substream {
struct snd_info_entry *proc_prealloc_entry;
#endif
/* misc flags */
struct snd_info_entry *proc_prealloc_entry;
#endif
/* misc flags */
- unsigned int no_mmap_ctrl: 1;
unsigned int hw_opened: 1;
};
unsigned int hw_opened: 1;
};
@@
-402,7
+403,6
@@
struct snd_pcm_str {
/* -- OSS things -- */
struct snd_pcm_oss_stream oss;
#endif
/* -- OSS things -- */
struct snd_pcm_oss_stream oss;
#endif
- struct snd_pcm_file *files;
#ifdef CONFIG_SND_VERBOSE_PROCFS
struct snd_info_entry *proc_root;
struct snd_info_entry *proc_info_entry;
#ifdef CONFIG_SND_VERBOSE_PROCFS
struct snd_info_entry *proc_root;
struct snd_info_entry *proc_info_entry;