diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 16:38:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 16:38:36 -0800 |
| commit | 4da5cc2cec8caec1d357053e85a7a32f243f93a1 (patch) | |
| tree | 3f8b603af4af88f86be7ec1d4e3639a7fc9dd1a6 /sound/isa/wavefront/wavefront_midi.c | |
| parent | 25c862cc9ea9b312c25a9f577f91b973131f1261 (diff) | |
| parent | c6f43290ae687c11cdcd150d8bfeb57ec29cfa5b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa
Diffstat (limited to 'sound/isa/wavefront/wavefront_midi.c')
| -rw-r--r-- | sound/isa/wavefront/wavefront_midi.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sound/isa/wavefront/wavefront_midi.c b/sound/isa/wavefront/wavefront_midi.c index 6f51d64fb56..15888ba2169 100644 --- a/sound/isa/wavefront/wavefront_midi.c +++ b/sound/isa/wavefront/wavefront_midi.c @@ -91,10 +91,10 @@ write_data (snd_wavefront_midi_t *midi, unsigned char byte) } static snd_wavefront_midi_t * -get_wavefront_midi (snd_rawmidi_substream_t *substream) +get_wavefront_midi (struct snd_rawmidi_substream *substream) { - snd_card_t *card; + struct snd_card *card; snd_wavefront_card_t *acard; if (substream == NULL || substream->rmidi == NULL) @@ -230,7 +230,7 @@ static void snd_wavefront_midi_output_write(snd_wavefront_card_t *card) } } -static int snd_wavefront_midi_input_open(snd_rawmidi_substream_t * substream) +static int snd_wavefront_midi_input_open(struct snd_rawmidi_substream *substream) { unsigned long flags; snd_wavefront_midi_t *midi; @@ -252,7 +252,7 @@ static int snd_wavefront_midi_input_open(snd_rawmidi_substream_t * substream) return 0; } -static int snd_wavefront_midi_output_open(snd_rawmidi_substream_t * substream) +static int snd_wavefront_midi_output_open(struct snd_rawmidi_substream *substream) { unsigned long flags; snd_wavefront_midi_t *midi; @@ -274,7 +274,7 @@ static int snd_wavefront_midi_output_open(snd_rawmidi_substream_t * substream) return 0; } -static int snd_wavefront_midi_input_close(snd_rawmidi_substream_t * substream) +static int snd_wavefront_midi_input_close(struct snd_rawmidi_substream *substream) { unsigned long flags; snd_wavefront_midi_t *midi; @@ -295,7 +295,7 @@ static int snd_wavefront_midi_input_close(snd_rawmidi_substream_t * substream) return 0; } -static int snd_wavefront_midi_output_close(snd_rawmidi_substream_t * substream) +static int snd_wavefront_midi_output_close(struct snd_rawmidi_substream *substream) { unsigned long flags; snd_wavefront_midi_t *midi; @@ -315,7 +315,7 @@ static int snd_wavefront_midi_output_close(snd_rawmidi_substream_t * substream) return 0; } -static void snd_wavefront_midi_input_trigger(snd_rawmidi_substream_t * substream, int up) +static void snd_wavefront_midi_input_trigger(struct snd_rawmidi_substream *substream, int up) { unsigned long flags; snd_wavefront_midi_t *midi; @@ -355,7 +355,7 @@ static void snd_wavefront_midi_output_timer(unsigned long data) snd_wavefront_midi_output_write(card); } -static void snd_wavefront_midi_output_trigger(snd_rawmidi_substream_t * substream, int up) +static void snd_wavefront_midi_output_trigger(struct snd_rawmidi_substream *substream, int up) { unsigned long flags; snd_wavefront_midi_t *midi; @@ -401,7 +401,7 @@ snd_wavefront_midi_interrupt (snd_wavefront_card_t *card) { unsigned long flags; snd_wavefront_midi_t *midi; - static snd_rawmidi_substream_t *substream = NULL; + static struct snd_rawmidi_substream *substream = NULL; static int mpu = external_mpu; int max = 128; unsigned char byte; @@ -554,14 +554,14 @@ snd_wavefront_midi_start (snd_wavefront_card_t *card) return 0; } -snd_rawmidi_ops_t snd_wavefront_midi_output = +struct snd_rawmidi_ops snd_wavefront_midi_output = { .open = snd_wavefront_midi_output_open, .close = snd_wavefront_midi_output_close, .trigger = snd_wavefront_midi_output_trigger, }; -snd_rawmidi_ops_t snd_wavefront_midi_input = +struct snd_rawmidi_ops snd_wavefront_midi_input = { .open = snd_wavefront_midi_input_open, .close = snd_wavefront_midi_input_close, |