diff options
Diffstat (limited to 'sound/firewire/oxfw/oxfw.h')
-rw-r--r-- | sound/firewire/oxfw/oxfw.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/sound/firewire/oxfw/oxfw.h b/sound/firewire/oxfw/oxfw.h index 83a54fc73a11..cace5ad4fe76 100644 --- a/sound/firewire/oxfw/oxfw.h +++ b/sound/firewire/oxfw/oxfw.h | |||
@@ -12,6 +12,7 @@ | |||
12 | #include <linux/mod_devicetable.h> | 12 | #include <linux/mod_devicetable.h> |
13 | #include <linux/mutex.h> | 13 | #include <linux/mutex.h> |
14 | #include <linux/slab.h> | 14 | #include <linux/slab.h> |
15 | #include <linux/compat.h> | ||
15 | 16 | ||
16 | #include <sound/control.h> | 17 | #include <sound/control.h> |
17 | #include <sound/core.h> | 18 | #include <sound/core.h> |
@@ -20,6 +21,8 @@ | |||
20 | #include <sound/pcm_params.h> | 21 | #include <sound/pcm_params.h> |
21 | #include <sound/info.h> | 22 | #include <sound/info.h> |
22 | #include <sound/rawmidi.h> | 23 | #include <sound/rawmidi.h> |
24 | #include <sound/firewire.h> | ||
25 | #include <sound/hwdep.h> | ||
23 | 26 | ||
24 | #include "../lib.h" | 27 | #include "../lib.h" |
25 | #include "../fcp.h" | 28 | #include "../fcp.h" |
@@ -64,6 +67,10 @@ struct snd_oxfw { | |||
64 | s16 volume[6]; | 67 | s16 volume[6]; |
65 | s16 volume_min; | 68 | s16 volume_min; |
66 | s16 volume_max; | 69 | s16 volume_max; |
70 | |||
71 | int dev_lock_count; | ||
72 | bool dev_lock_changed; | ||
73 | wait_queue_head_t hwdep_wait; | ||
67 | }; | 74 | }; |
68 | 75 | ||
69 | /* | 76 | /* |
@@ -124,6 +131,10 @@ int snd_oxfw_stream_get_current_formation(struct snd_oxfw *oxfw, | |||
124 | 131 | ||
125 | int snd_oxfw_stream_discover(struct snd_oxfw *oxfw); | 132 | int snd_oxfw_stream_discover(struct snd_oxfw *oxfw); |
126 | 133 | ||
134 | void snd_oxfw_stream_lock_changed(struct snd_oxfw *oxfw); | ||
135 | int snd_oxfw_stream_lock_try(struct snd_oxfw *oxfw); | ||
136 | void snd_oxfw_stream_lock_release(struct snd_oxfw *oxfw); | ||
137 | |||
127 | int snd_oxfw_create_pcm(struct snd_oxfw *oxfw); | 138 | int snd_oxfw_create_pcm(struct snd_oxfw *oxfw); |
128 | 139 | ||
129 | int snd_oxfw_create_mixer(struct snd_oxfw *oxfw); | 140 | int snd_oxfw_create_mixer(struct snd_oxfw *oxfw); |
@@ -131,3 +142,5 @@ int snd_oxfw_create_mixer(struct snd_oxfw *oxfw); | |||
131 | void snd_oxfw_proc_init(struct snd_oxfw *oxfw); | 142 | void snd_oxfw_proc_init(struct snd_oxfw *oxfw); |
132 | 143 | ||
133 | int snd_oxfw_create_midi(struct snd_oxfw *oxfw); | 144 | int snd_oxfw_create_midi(struct snd_oxfw *oxfw); |
145 | |||
146 | int snd_oxfw_create_hwdep(struct snd_oxfw *oxfw); | ||