diff options
Diffstat (limited to 'sound/pci/emu10k1/io.c')
-rw-r--r-- | sound/pci/emu10k1/io.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/sound/pci/emu10k1/io.c b/sound/pci/emu10k1/io.c index b9d3ae0dcab7..5d116dd7403b 100644 --- a/sound/pci/emu10k1/io.c +++ b/sound/pci/emu10k1/io.c | |||
@@ -30,7 +30,7 @@ | |||
30 | #include <sound/core.h> | 30 | #include <sound/core.h> |
31 | #include <sound/emu10k1.h> | 31 | #include <sound/emu10k1.h> |
32 | 32 | ||
33 | unsigned int snd_emu10k1_ptr_read(emu10k1_t * emu, unsigned int reg, unsigned int chn) | 33 | unsigned int snd_emu10k1_ptr_read(struct snd_emu10k1 * emu, unsigned int reg, unsigned int chn) |
34 | { | 34 | { |
35 | unsigned long flags; | 35 | unsigned long flags; |
36 | unsigned int regptr, val; | 36 | unsigned int regptr, val; |
@@ -61,7 +61,7 @@ unsigned int snd_emu10k1_ptr_read(emu10k1_t * emu, unsigned int reg, unsigned in | |||
61 | } | 61 | } |
62 | } | 62 | } |
63 | 63 | ||
64 | void snd_emu10k1_ptr_write(emu10k1_t *emu, unsigned int reg, unsigned int chn, unsigned int data) | 64 | void snd_emu10k1_ptr_write(struct snd_emu10k1 *emu, unsigned int reg, unsigned int chn, unsigned int data) |
65 | { | 65 | { |
66 | unsigned int regptr; | 66 | unsigned int regptr; |
67 | unsigned long flags; | 67 | unsigned long flags; |
@@ -91,7 +91,7 @@ void snd_emu10k1_ptr_write(emu10k1_t *emu, unsigned int reg, unsigned int chn, u | |||
91 | } | 91 | } |
92 | } | 92 | } |
93 | 93 | ||
94 | unsigned int snd_emu10k1_ptr20_read(emu10k1_t * emu, | 94 | unsigned int snd_emu10k1_ptr20_read(struct snd_emu10k1 * emu, |
95 | unsigned int reg, | 95 | unsigned int reg, |
96 | unsigned int chn) | 96 | unsigned int chn) |
97 | { | 97 | { |
@@ -107,7 +107,7 @@ unsigned int snd_emu10k1_ptr20_read(emu10k1_t * emu, | |||
107 | return val; | 107 | return val; |
108 | } | 108 | } |
109 | 109 | ||
110 | void snd_emu10k1_ptr20_write(emu10k1_t *emu, | 110 | void snd_emu10k1_ptr20_write(struct snd_emu10k1 *emu, |
111 | unsigned int reg, | 111 | unsigned int reg, |
112 | unsigned int chn, | 112 | unsigned int chn, |
113 | unsigned int data) | 113 | unsigned int data) |
@@ -123,7 +123,7 @@ void snd_emu10k1_ptr20_write(emu10k1_t *emu, | |||
123 | spin_unlock_irqrestore(&emu->emu_lock, flags); | 123 | spin_unlock_irqrestore(&emu->emu_lock, flags); |
124 | } | 124 | } |
125 | 125 | ||
126 | void snd_emu10k1_intr_enable(emu10k1_t *emu, unsigned int intrenb) | 126 | void snd_emu10k1_intr_enable(struct snd_emu10k1 *emu, unsigned int intrenb) |
127 | { | 127 | { |
128 | unsigned long flags; | 128 | unsigned long flags; |
129 | unsigned int enable; | 129 | unsigned int enable; |
@@ -134,7 +134,7 @@ void snd_emu10k1_intr_enable(emu10k1_t *emu, unsigned int intrenb) | |||
134 | spin_unlock_irqrestore(&emu->emu_lock, flags); | 134 | spin_unlock_irqrestore(&emu->emu_lock, flags); |
135 | } | 135 | } |
136 | 136 | ||
137 | void snd_emu10k1_intr_disable(emu10k1_t *emu, unsigned int intrenb) | 137 | void snd_emu10k1_intr_disable(struct snd_emu10k1 *emu, unsigned int intrenb) |
138 | { | 138 | { |
139 | unsigned long flags; | 139 | unsigned long flags; |
140 | unsigned int enable; | 140 | unsigned int enable; |
@@ -145,7 +145,7 @@ void snd_emu10k1_intr_disable(emu10k1_t *emu, unsigned int intrenb) | |||
145 | spin_unlock_irqrestore(&emu->emu_lock, flags); | 145 | spin_unlock_irqrestore(&emu->emu_lock, flags); |
146 | } | 146 | } |
147 | 147 | ||
148 | void snd_emu10k1_voice_intr_enable(emu10k1_t *emu, unsigned int voicenum) | 148 | void snd_emu10k1_voice_intr_enable(struct snd_emu10k1 *emu, unsigned int voicenum) |
149 | { | 149 | { |
150 | unsigned long flags; | 150 | unsigned long flags; |
151 | unsigned int val; | 151 | unsigned int val; |
@@ -165,7 +165,7 @@ void snd_emu10k1_voice_intr_enable(emu10k1_t *emu, unsigned int voicenum) | |||
165 | spin_unlock_irqrestore(&emu->emu_lock, flags); | 165 | spin_unlock_irqrestore(&emu->emu_lock, flags); |
166 | } | 166 | } |
167 | 167 | ||
168 | void snd_emu10k1_voice_intr_disable(emu10k1_t *emu, unsigned int voicenum) | 168 | void snd_emu10k1_voice_intr_disable(struct snd_emu10k1 *emu, unsigned int voicenum) |
169 | { | 169 | { |
170 | unsigned long flags; | 170 | unsigned long flags; |
171 | unsigned int val; | 171 | unsigned int val; |
@@ -185,7 +185,7 @@ void snd_emu10k1_voice_intr_disable(emu10k1_t *emu, unsigned int voicenum) | |||
185 | spin_unlock_irqrestore(&emu->emu_lock, flags); | 185 | spin_unlock_irqrestore(&emu->emu_lock, flags); |
186 | } | 186 | } |
187 | 187 | ||
188 | void snd_emu10k1_voice_intr_ack(emu10k1_t *emu, unsigned int voicenum) | 188 | void snd_emu10k1_voice_intr_ack(struct snd_emu10k1 *emu, unsigned int voicenum) |
189 | { | 189 | { |
190 | unsigned long flags; | 190 | unsigned long flags; |
191 | 191 | ||
@@ -202,7 +202,7 @@ void snd_emu10k1_voice_intr_ack(emu10k1_t *emu, unsigned int voicenum) | |||
202 | spin_unlock_irqrestore(&emu->emu_lock, flags); | 202 | spin_unlock_irqrestore(&emu->emu_lock, flags); |
203 | } | 203 | } |
204 | 204 | ||
205 | void snd_emu10k1_voice_half_loop_intr_enable(emu10k1_t *emu, unsigned int voicenum) | 205 | void snd_emu10k1_voice_half_loop_intr_enable(struct snd_emu10k1 *emu, unsigned int voicenum) |
206 | { | 206 | { |
207 | unsigned long flags; | 207 | unsigned long flags; |
208 | unsigned int val; | 208 | unsigned int val; |
@@ -222,7 +222,7 @@ void snd_emu10k1_voice_half_loop_intr_enable(emu10k1_t *emu, unsigned int voicen | |||
222 | spin_unlock_irqrestore(&emu->emu_lock, flags); | 222 | spin_unlock_irqrestore(&emu->emu_lock, flags); |
223 | } | 223 | } |
224 | 224 | ||
225 | void snd_emu10k1_voice_half_loop_intr_disable(emu10k1_t *emu, unsigned int voicenum) | 225 | void snd_emu10k1_voice_half_loop_intr_disable(struct snd_emu10k1 *emu, unsigned int voicenum) |
226 | { | 226 | { |
227 | unsigned long flags; | 227 | unsigned long flags; |
228 | unsigned int val; | 228 | unsigned int val; |
@@ -242,7 +242,7 @@ void snd_emu10k1_voice_half_loop_intr_disable(emu10k1_t *emu, unsigned int voice | |||
242 | spin_unlock_irqrestore(&emu->emu_lock, flags); | 242 | spin_unlock_irqrestore(&emu->emu_lock, flags); |
243 | } | 243 | } |
244 | 244 | ||
245 | void snd_emu10k1_voice_half_loop_intr_ack(emu10k1_t *emu, unsigned int voicenum) | 245 | void snd_emu10k1_voice_half_loop_intr_ack(struct snd_emu10k1 *emu, unsigned int voicenum) |
246 | { | 246 | { |
247 | unsigned long flags; | 247 | unsigned long flags; |
248 | 248 | ||
@@ -259,7 +259,7 @@ void snd_emu10k1_voice_half_loop_intr_ack(emu10k1_t *emu, unsigned int voicenum) | |||
259 | spin_unlock_irqrestore(&emu->emu_lock, flags); | 259 | spin_unlock_irqrestore(&emu->emu_lock, flags); |
260 | } | 260 | } |
261 | 261 | ||
262 | void snd_emu10k1_voice_set_loop_stop(emu10k1_t *emu, unsigned int voicenum) | 262 | void snd_emu10k1_voice_set_loop_stop(struct snd_emu10k1 *emu, unsigned int voicenum) |
263 | { | 263 | { |
264 | unsigned long flags; | 264 | unsigned long flags; |
265 | unsigned int sol; | 265 | unsigned int sol; |
@@ -279,7 +279,7 @@ void snd_emu10k1_voice_set_loop_stop(emu10k1_t *emu, unsigned int voicenum) | |||
279 | spin_unlock_irqrestore(&emu->emu_lock, flags); | 279 | spin_unlock_irqrestore(&emu->emu_lock, flags); |
280 | } | 280 | } |
281 | 281 | ||
282 | void snd_emu10k1_voice_clear_loop_stop(emu10k1_t *emu, unsigned int voicenum) | 282 | void snd_emu10k1_voice_clear_loop_stop(struct snd_emu10k1 *emu, unsigned int voicenum) |
283 | { | 283 | { |
284 | unsigned long flags; | 284 | unsigned long flags; |
285 | unsigned int sol; | 285 | unsigned int sol; |
@@ -299,7 +299,7 @@ void snd_emu10k1_voice_clear_loop_stop(emu10k1_t *emu, unsigned int voicenum) | |||
299 | spin_unlock_irqrestore(&emu->emu_lock, flags); | 299 | spin_unlock_irqrestore(&emu->emu_lock, flags); |
300 | } | 300 | } |
301 | 301 | ||
302 | void snd_emu10k1_wait(emu10k1_t *emu, unsigned int wait) | 302 | void snd_emu10k1_wait(struct snd_emu10k1 *emu, unsigned int wait) |
303 | { | 303 | { |
304 | volatile unsigned count; | 304 | volatile unsigned count; |
305 | unsigned int newtime = 0, curtime; | 305 | unsigned int newtime = 0, curtime; |
@@ -318,9 +318,9 @@ void snd_emu10k1_wait(emu10k1_t *emu, unsigned int wait) | |||
318 | } | 318 | } |
319 | } | 319 | } |
320 | 320 | ||
321 | unsigned short snd_emu10k1_ac97_read(ac97_t *ac97, unsigned short reg) | 321 | unsigned short snd_emu10k1_ac97_read(struct snd_ac97 *ac97, unsigned short reg) |
322 | { | 322 | { |
323 | emu10k1_t *emu = ac97->private_data; | 323 | struct snd_emu10k1 *emu = ac97->private_data; |
324 | unsigned long flags; | 324 | unsigned long flags; |
325 | unsigned short val; | 325 | unsigned short val; |
326 | 326 | ||
@@ -331,9 +331,9 @@ unsigned short snd_emu10k1_ac97_read(ac97_t *ac97, unsigned short reg) | |||
331 | return val; | 331 | return val; |
332 | } | 332 | } |
333 | 333 | ||
334 | void snd_emu10k1_ac97_write(ac97_t *ac97, unsigned short reg, unsigned short data) | 334 | void snd_emu10k1_ac97_write(struct snd_ac97 *ac97, unsigned short reg, unsigned short data) |
335 | { | 335 | { |
336 | emu10k1_t *emu = ac97->private_data; | 336 | struct snd_emu10k1 *emu = ac97->private_data; |
337 | unsigned long flags; | 337 | unsigned long flags; |
338 | 338 | ||
339 | spin_lock_irqsave(&emu->emu_lock, flags); | 339 | spin_lock_irqsave(&emu->emu_lock, flags); |