diff options
author | Takashi Iwai <tiwai@suse.de> | 2005-11-17 08:34:36 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 06:18:25 -0500 |
commit | 029d64b0cfa30abc10f722e2f67d282abe09c9da (patch) | |
tree | d9a1e72e9792b33e57db2695f6c1a1a4843df0bf /sound/isa/sb/sb8_midi.c | |
parent | d3a7e476740dc23588ea65fa0df1aacdf8e70003 (diff) |
[ALSA] Remove xxx_t typedefs: ISA SB8/SB16/SBAWE
Remove xxx_t typedefs from the ISA SB8/SB16/SBAWE drivers.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa/sb/sb8_midi.c')
-rw-r--r-- | sound/isa/sb/sb8_midi.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/sound/isa/sb/sb8_midi.c b/sound/isa/sb/sb8_midi.c index d2c633a40e74..c549aceea294 100644 --- a/sound/isa/sb/sb8_midi.c +++ b/sound/isa/sb/sb8_midi.c | |||
@@ -36,9 +36,9 @@ | |||
36 | 36 | ||
37 | */ | 37 | */ |
38 | 38 | ||
39 | irqreturn_t snd_sb8dsp_midi_interrupt(sb_t * chip) | 39 | irqreturn_t snd_sb8dsp_midi_interrupt(struct snd_sb * chip) |
40 | { | 40 | { |
41 | snd_rawmidi_t *rmidi; | 41 | struct snd_rawmidi *rmidi; |
42 | int max = 64; | 42 | int max = 64; |
43 | char byte; | 43 | char byte; |
44 | 44 | ||
@@ -63,10 +63,10 @@ irqreturn_t snd_sb8dsp_midi_interrupt(sb_t * chip) | |||
63 | 63 | ||
64 | */ | 64 | */ |
65 | 65 | ||
66 | static int snd_sb8dsp_midi_input_open(snd_rawmidi_substream_t * substream) | 66 | static int snd_sb8dsp_midi_input_open(struct snd_rawmidi_substream *substream) |
67 | { | 67 | { |
68 | unsigned long flags; | 68 | unsigned long flags; |
69 | sb_t *chip; | 69 | struct snd_sb *chip; |
70 | unsigned int valid_open_flags; | 70 | unsigned int valid_open_flags; |
71 | 71 | ||
72 | chip = substream->rmidi->private_data; | 72 | chip = substream->rmidi->private_data; |
@@ -90,10 +90,10 @@ static int snd_sb8dsp_midi_input_open(snd_rawmidi_substream_t * substream) | |||
90 | return 0; | 90 | return 0; |
91 | } | 91 | } |
92 | 92 | ||
93 | static int snd_sb8dsp_midi_output_open(snd_rawmidi_substream_t * substream) | 93 | static int snd_sb8dsp_midi_output_open(struct snd_rawmidi_substream *substream) |
94 | { | 94 | { |
95 | unsigned long flags; | 95 | unsigned long flags; |
96 | sb_t *chip; | 96 | struct snd_sb *chip; |
97 | unsigned int valid_open_flags; | 97 | unsigned int valid_open_flags; |
98 | 98 | ||
99 | chip = substream->rmidi->private_data; | 99 | chip = substream->rmidi->private_data; |
@@ -117,10 +117,10 @@ static int snd_sb8dsp_midi_output_open(snd_rawmidi_substream_t * substream) | |||
117 | return 0; | 117 | return 0; |
118 | } | 118 | } |
119 | 119 | ||
120 | static int snd_sb8dsp_midi_input_close(snd_rawmidi_substream_t * substream) | 120 | static int snd_sb8dsp_midi_input_close(struct snd_rawmidi_substream *substream) |
121 | { | 121 | { |
122 | unsigned long flags; | 122 | unsigned long flags; |
123 | sb_t *chip; | 123 | struct snd_sb *chip; |
124 | 124 | ||
125 | chip = substream->rmidi->private_data; | 125 | chip = substream->rmidi->private_data; |
126 | spin_lock_irqsave(&chip->open_lock, flags); | 126 | spin_lock_irqsave(&chip->open_lock, flags); |
@@ -135,10 +135,10 @@ static int snd_sb8dsp_midi_input_close(snd_rawmidi_substream_t * substream) | |||
135 | return 0; | 135 | return 0; |
136 | } | 136 | } |
137 | 137 | ||
138 | static int snd_sb8dsp_midi_output_close(snd_rawmidi_substream_t * substream) | 138 | static int snd_sb8dsp_midi_output_close(struct snd_rawmidi_substream *substream) |
139 | { | 139 | { |
140 | unsigned long flags; | 140 | unsigned long flags; |
141 | sb_t *chip; | 141 | struct snd_sb *chip; |
142 | 142 | ||
143 | chip = substream->rmidi->private_data; | 143 | chip = substream->rmidi->private_data; |
144 | spin_lock_irqsave(&chip->open_lock, flags); | 144 | spin_lock_irqsave(&chip->open_lock, flags); |
@@ -153,10 +153,10 @@ static int snd_sb8dsp_midi_output_close(snd_rawmidi_substream_t * substream) | |||
153 | return 0; | 153 | return 0; |
154 | } | 154 | } |
155 | 155 | ||
156 | static void snd_sb8dsp_midi_input_trigger(snd_rawmidi_substream_t * substream, int up) | 156 | static void snd_sb8dsp_midi_input_trigger(struct snd_rawmidi_substream *substream, int up) |
157 | { | 157 | { |
158 | unsigned long flags; | 158 | unsigned long flags; |
159 | sb_t *chip; | 159 | struct snd_sb *chip; |
160 | 160 | ||
161 | chip = substream->rmidi->private_data; | 161 | chip = substream->rmidi->private_data; |
162 | spin_lock_irqsave(&chip->open_lock, flags); | 162 | spin_lock_irqsave(&chip->open_lock, flags); |
@@ -176,10 +176,10 @@ static void snd_sb8dsp_midi_input_trigger(snd_rawmidi_substream_t * substream, i | |||
176 | spin_unlock_irqrestore(&chip->open_lock, flags); | 176 | spin_unlock_irqrestore(&chip->open_lock, flags); |
177 | } | 177 | } |
178 | 178 | ||
179 | static void snd_sb8dsp_midi_output_write(snd_rawmidi_substream_t * substream) | 179 | static void snd_sb8dsp_midi_output_write(struct snd_rawmidi_substream *substream) |
180 | { | 180 | { |
181 | unsigned long flags; | 181 | unsigned long flags; |
182 | sb_t *chip; | 182 | struct snd_sb *chip; |
183 | char byte; | 183 | char byte; |
184 | int max = 32; | 184 | int max = 32; |
185 | 185 | ||
@@ -214,8 +214,8 @@ static void snd_sb8dsp_midi_output_write(snd_rawmidi_substream_t * substream) | |||
214 | 214 | ||
215 | static void snd_sb8dsp_midi_output_timer(unsigned long data) | 215 | static void snd_sb8dsp_midi_output_timer(unsigned long data) |
216 | { | 216 | { |
217 | snd_rawmidi_substream_t * substream = (snd_rawmidi_substream_t *) data; | 217 | struct snd_rawmidi_substream *substream = (struct snd_rawmidi_substream *) data; |
218 | sb_t * chip = substream->rmidi->private_data; | 218 | struct snd_sb * chip = substream->rmidi->private_data; |
219 | unsigned long flags; | 219 | unsigned long flags; |
220 | 220 | ||
221 | spin_lock_irqsave(&chip->open_lock, flags); | 221 | spin_lock_irqsave(&chip->open_lock, flags); |
@@ -225,10 +225,10 @@ static void snd_sb8dsp_midi_output_timer(unsigned long data) | |||
225 | snd_sb8dsp_midi_output_write(substream); | 225 | snd_sb8dsp_midi_output_write(substream); |
226 | } | 226 | } |
227 | 227 | ||
228 | static void snd_sb8dsp_midi_output_trigger(snd_rawmidi_substream_t * substream, int up) | 228 | static void snd_sb8dsp_midi_output_trigger(struct snd_rawmidi_substream *substream, int up) |
229 | { | 229 | { |
230 | unsigned long flags; | 230 | unsigned long flags; |
231 | sb_t *chip; | 231 | struct snd_sb *chip; |
232 | 232 | ||
233 | chip = substream->rmidi->private_data; | 233 | chip = substream->rmidi->private_data; |
234 | spin_lock_irqsave(&chip->open_lock, flags); | 234 | spin_lock_irqsave(&chip->open_lock, flags); |
@@ -256,23 +256,23 @@ static void snd_sb8dsp_midi_output_trigger(snd_rawmidi_substream_t * substream, | |||
256 | 256 | ||
257 | */ | 257 | */ |
258 | 258 | ||
259 | static snd_rawmidi_ops_t snd_sb8dsp_midi_output = | 259 | static struct snd_rawmidi_ops snd_sb8dsp_midi_output = |
260 | { | 260 | { |
261 | .open = snd_sb8dsp_midi_output_open, | 261 | .open = snd_sb8dsp_midi_output_open, |
262 | .close = snd_sb8dsp_midi_output_close, | 262 | .close = snd_sb8dsp_midi_output_close, |
263 | .trigger = snd_sb8dsp_midi_output_trigger, | 263 | .trigger = snd_sb8dsp_midi_output_trigger, |
264 | }; | 264 | }; |
265 | 265 | ||
266 | static snd_rawmidi_ops_t snd_sb8dsp_midi_input = | 266 | static struct snd_rawmidi_ops snd_sb8dsp_midi_input = |
267 | { | 267 | { |
268 | .open = snd_sb8dsp_midi_input_open, | 268 | .open = snd_sb8dsp_midi_input_open, |
269 | .close = snd_sb8dsp_midi_input_close, | 269 | .close = snd_sb8dsp_midi_input_close, |
270 | .trigger = snd_sb8dsp_midi_input_trigger, | 270 | .trigger = snd_sb8dsp_midi_input_trigger, |
271 | }; | 271 | }; |
272 | 272 | ||
273 | int snd_sb8dsp_midi(sb_t *chip, int device, snd_rawmidi_t ** rrawmidi) | 273 | int snd_sb8dsp_midi(struct snd_sb *chip, int device, struct snd_rawmidi ** rrawmidi) |
274 | { | 274 | { |
275 | snd_rawmidi_t *rmidi; | 275 | struct snd_rawmidi *rmidi; |
276 | int err; | 276 | int err; |
277 | 277 | ||
278 | if (rrawmidi) | 278 | if (rrawmidi) |