diff options
author | Takashi Iwai <tiwai@suse.de> | 2005-11-17 08:36:44 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 06:18:27 -0500 |
commit | 5e2da20648e39a0e3cb33861499b686a6fe38112 (patch) | |
tree | e5f3117e2f44b262f9b6d45cfbd9e17a0ea913bd /sound/isa/gus/gus_uart.c | |
parent | 029d64b0cfa30abc10f722e2f67d282abe09c9da (diff) |
[ALSA] Remove xxx_t typedefs: ISA GUS
Remove xxx_t typedefs from the ISA GUS drivers.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa/gus/gus_uart.c')
-rw-r--r-- | sound/isa/gus/gus_uart.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/sound/isa/gus/gus_uart.c b/sound/isa/gus/gus_uart.c index fbc95e99105c..654290a8b21c 100644 --- a/sound/isa/gus/gus_uart.c +++ b/sound/isa/gus/gus_uart.c | |||
@@ -26,7 +26,7 @@ | |||
26 | #include <sound/core.h> | 26 | #include <sound/core.h> |
27 | #include <sound/gus.h> | 27 | #include <sound/gus.h> |
28 | 28 | ||
29 | static void snd_gf1_interrupt_midi_in(snd_gus_card_t * gus) | 29 | static void snd_gf1_interrupt_midi_in(struct snd_gus_card * gus) |
30 | { | 30 | { |
31 | int count; | 31 | int count; |
32 | unsigned char stat, data, byte; | 32 | unsigned char stat, data, byte; |
@@ -61,7 +61,7 @@ static void snd_gf1_interrupt_midi_in(snd_gus_card_t * gus) | |||
61 | } | 61 | } |
62 | } | 62 | } |
63 | 63 | ||
64 | static void snd_gf1_interrupt_midi_out(snd_gus_card_t * gus) | 64 | static void snd_gf1_interrupt_midi_out(struct snd_gus_card * gus) |
65 | { | 65 | { |
66 | char byte; | 66 | char byte; |
67 | unsigned long flags; | 67 | unsigned long flags; |
@@ -81,7 +81,7 @@ static void snd_gf1_interrupt_midi_out(snd_gus_card_t * gus) | |||
81 | spin_unlock_irqrestore(&gus->uart_cmd_lock, flags); | 81 | spin_unlock_irqrestore(&gus->uart_cmd_lock, flags); |
82 | } | 82 | } |
83 | 83 | ||
84 | static void snd_gf1_uart_reset(snd_gus_card_t * gus, int close) | 84 | static void snd_gf1_uart_reset(struct snd_gus_card * gus, int close) |
85 | { | 85 | { |
86 | snd_gf1_uart_cmd(gus, 0x03); /* reset */ | 86 | snd_gf1_uart_cmd(gus, 0x03); /* reset */ |
87 | if (!close && gus->uart_enable) { | 87 | if (!close && gus->uart_enable) { |
@@ -90,10 +90,10 @@ static void snd_gf1_uart_reset(snd_gus_card_t * gus, int close) | |||
90 | } | 90 | } |
91 | } | 91 | } |
92 | 92 | ||
93 | static int snd_gf1_uart_output_open(snd_rawmidi_substream_t * substream) | 93 | static int snd_gf1_uart_output_open(struct snd_rawmidi_substream *substream) |
94 | { | 94 | { |
95 | unsigned long flags; | 95 | unsigned long flags; |
96 | snd_gus_card_t *gus; | 96 | struct snd_gus_card *gus; |
97 | 97 | ||
98 | gus = substream->rmidi->private_data; | 98 | gus = substream->rmidi->private_data; |
99 | spin_lock_irqsave(&gus->uart_cmd_lock, flags); | 99 | spin_lock_irqsave(&gus->uart_cmd_lock, flags); |
@@ -109,10 +109,10 @@ static int snd_gf1_uart_output_open(snd_rawmidi_substream_t * substream) | |||
109 | return 0; | 109 | return 0; |
110 | } | 110 | } |
111 | 111 | ||
112 | static int snd_gf1_uart_input_open(snd_rawmidi_substream_t * substream) | 112 | static int snd_gf1_uart_input_open(struct snd_rawmidi_substream *substream) |
113 | { | 113 | { |
114 | unsigned long flags; | 114 | unsigned long flags; |
115 | snd_gus_card_t *gus; | 115 | struct snd_gus_card *gus; |
116 | int i; | 116 | int i; |
117 | 117 | ||
118 | gus = substream->rmidi->private_data; | 118 | gus = substream->rmidi->private_data; |
@@ -136,10 +136,10 @@ static int snd_gf1_uart_input_open(snd_rawmidi_substream_t * substream) | |||
136 | return 0; | 136 | return 0; |
137 | } | 137 | } |
138 | 138 | ||
139 | static int snd_gf1_uart_output_close(snd_rawmidi_substream_t * substream) | 139 | static int snd_gf1_uart_output_close(struct snd_rawmidi_substream *substream) |
140 | { | 140 | { |
141 | unsigned long flags; | 141 | unsigned long flags; |
142 | snd_gus_card_t *gus; | 142 | struct snd_gus_card *gus; |
143 | 143 | ||
144 | gus = substream->rmidi->private_data; | 144 | gus = substream->rmidi->private_data; |
145 | spin_lock_irqsave(&gus->uart_cmd_lock, flags); | 145 | spin_lock_irqsave(&gus->uart_cmd_lock, flags); |
@@ -151,10 +151,10 @@ static int snd_gf1_uart_output_close(snd_rawmidi_substream_t * substream) | |||
151 | return 0; | 151 | return 0; |
152 | } | 152 | } |
153 | 153 | ||
154 | static int snd_gf1_uart_input_close(snd_rawmidi_substream_t * substream) | 154 | static int snd_gf1_uart_input_close(struct snd_rawmidi_substream *substream) |
155 | { | 155 | { |
156 | unsigned long flags; | 156 | unsigned long flags; |
157 | snd_gus_card_t *gus; | 157 | struct snd_gus_card *gus; |
158 | 158 | ||
159 | gus = substream->rmidi->private_data; | 159 | gus = substream->rmidi->private_data; |
160 | spin_lock_irqsave(&gus->uart_cmd_lock, flags); | 160 | spin_lock_irqsave(&gus->uart_cmd_lock, flags); |
@@ -166,9 +166,9 @@ static int snd_gf1_uart_input_close(snd_rawmidi_substream_t * substream) | |||
166 | return 0; | 166 | return 0; |
167 | } | 167 | } |
168 | 168 | ||
169 | static void snd_gf1_uart_input_trigger(snd_rawmidi_substream_t * substream, int up) | 169 | static void snd_gf1_uart_input_trigger(struct snd_rawmidi_substream *substream, int up) |
170 | { | 170 | { |
171 | snd_gus_card_t *gus; | 171 | struct snd_gus_card *gus; |
172 | unsigned long flags; | 172 | unsigned long flags; |
173 | 173 | ||
174 | gus = substream->rmidi->private_data; | 174 | gus = substream->rmidi->private_data; |
@@ -184,10 +184,10 @@ static void snd_gf1_uart_input_trigger(snd_rawmidi_substream_t * substream, int | |||
184 | spin_unlock_irqrestore(&gus->uart_cmd_lock, flags); | 184 | spin_unlock_irqrestore(&gus->uart_cmd_lock, flags); |
185 | } | 185 | } |
186 | 186 | ||
187 | static void snd_gf1_uart_output_trigger(snd_rawmidi_substream_t * substream, int up) | 187 | static void snd_gf1_uart_output_trigger(struct snd_rawmidi_substream *substream, int up) |
188 | { | 188 | { |
189 | unsigned long flags; | 189 | unsigned long flags; |
190 | snd_gus_card_t *gus; | 190 | struct snd_gus_card *gus; |
191 | char byte; | 191 | char byte; |
192 | int timeout; | 192 | int timeout; |
193 | 193 | ||
@@ -222,23 +222,23 @@ static void snd_gf1_uart_output_trigger(snd_rawmidi_substream_t * substream, int | |||
222 | spin_unlock_irqrestore(&gus->uart_cmd_lock, flags); | 222 | spin_unlock_irqrestore(&gus->uart_cmd_lock, flags); |
223 | } | 223 | } |
224 | 224 | ||
225 | static snd_rawmidi_ops_t snd_gf1_uart_output = | 225 | static struct snd_rawmidi_ops snd_gf1_uart_output = |
226 | { | 226 | { |
227 | .open = snd_gf1_uart_output_open, | 227 | .open = snd_gf1_uart_output_open, |
228 | .close = snd_gf1_uart_output_close, | 228 | .close = snd_gf1_uart_output_close, |
229 | .trigger = snd_gf1_uart_output_trigger, | 229 | .trigger = snd_gf1_uart_output_trigger, |
230 | }; | 230 | }; |
231 | 231 | ||
232 | static snd_rawmidi_ops_t snd_gf1_uart_input = | 232 | static struct snd_rawmidi_ops snd_gf1_uart_input = |
233 | { | 233 | { |
234 | .open = snd_gf1_uart_input_open, | 234 | .open = snd_gf1_uart_input_open, |
235 | .close = snd_gf1_uart_input_close, | 235 | .close = snd_gf1_uart_input_close, |
236 | .trigger = snd_gf1_uart_input_trigger, | 236 | .trigger = snd_gf1_uart_input_trigger, |
237 | }; | 237 | }; |
238 | 238 | ||
239 | int snd_gf1_rawmidi_new(snd_gus_card_t * gus, int device, snd_rawmidi_t ** rrawmidi) | 239 | int snd_gf1_rawmidi_new(struct snd_gus_card * gus, int device, struct snd_rawmidi ** rrawmidi) |
240 | { | 240 | { |
241 | snd_rawmidi_t *rmidi; | 241 | struct snd_rawmidi *rmidi; |
242 | int err; | 242 | int err; |
243 | 243 | ||
244 | if (rrawmidi) | 244 | if (rrawmidi) |