diff options
author | Takashi Iwai <tiwai@suse.de> | 2005-11-17 08:55:40 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 06:19:01 -0500 |
commit | e4a3d145455159955d6ac1df976b2ed2a135b858 (patch) | |
tree | 71a0a4f0a71d07d153d32d88430f21ac4efcdde7 /sound/pci/ca0106/ca_midi.h | |
parent | 2fd16874aa6322e8b61879a78f3b485999506833 (diff) |
[ALSA] Remove xxx_t typedefs: PCI CA0106
Modules: CA0106 driver
Remove xxx_t typedefs from the PCI CA0106 driver.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/ca0106/ca_midi.h')
-rw-r--r-- | sound/pci/ca0106/ca_midi.h | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/sound/pci/ca0106/ca_midi.h b/sound/pci/ca0106/ca_midi.h index b452cec2bf57..b72c0933bd22 100644 --- a/sound/pci/ca0106/ca_midi.h +++ b/sound/pci/ca0106/ca_midi.h | |||
@@ -29,12 +29,11 @@ | |||
29 | #define CA_MIDI_MODE_INPUT MPU401_MODE_INPUT | 29 | #define CA_MIDI_MODE_INPUT MPU401_MODE_INPUT |
30 | #define CA_MIDI_MODE_OUTPUT MPU401_MODE_OUTPUT | 30 | #define CA_MIDI_MODE_OUTPUT MPU401_MODE_OUTPUT |
31 | 31 | ||
32 | typedef struct ca_midi ca_midi_t; | 32 | struct snd_ca_midi { |
33 | struct ca_midi { | ||
34 | 33 | ||
35 | snd_rawmidi_t *rmidi; | 34 | struct snd_rawmidi *rmidi; |
36 | snd_rawmidi_substream_t *substream_input; | 35 | struct snd_rawmidi_substream *substream_input; |
37 | snd_rawmidi_substream_t *substream_output; | 36 | struct snd_rawmidi_substream *substream_output; |
38 | 37 | ||
39 | void *dev_id; | 38 | void *dev_id; |
40 | 39 | ||
@@ -52,18 +51,16 @@ struct ca_midi { | |||
52 | int input_avail, output_ready; | 51 | int input_avail, output_ready; |
53 | int ack, reset, enter_uart; | 52 | int ack, reset, enter_uart; |
54 | 53 | ||
55 | void (*interrupt)(ca_midi_t *midi, unsigned int status); | 54 | void (*interrupt)(struct snd_ca_midi *midi, unsigned int status); |
56 | void (*interrupt_enable)(ca_midi_t *midi, int intr); | 55 | void (*interrupt_enable)(struct snd_ca_midi *midi, int intr); |
57 | void (*interrupt_disable)(ca_midi_t *midi, int intr); | 56 | void (*interrupt_disable)(struct snd_ca_midi *midi, int intr); |
58 | 57 | ||
59 | unsigned char (*read)(ca_midi_t *midi, int idx); | 58 | unsigned char (*read)(struct snd_ca_midi *midi, int idx); |
60 | void (*write)(ca_midi_t *midi, int data, int idx); | 59 | void (*write)(struct snd_ca_midi *midi, int data, int idx); |
61 | 60 | ||
62 | /* get info from dev_id */ | 61 | /* get info from dev_id */ |
63 | snd_card_t *(*get_dev_id_card)(void *dev_id); | 62 | struct snd_card *(*get_dev_id_card)(void *dev_id); |
64 | int (*get_dev_id_port)(void *dev_id); | 63 | int (*get_dev_id_port)(void *dev_id); |
65 | }; | 64 | }; |
66 | 65 | ||
67 | int __devinit ca_midi_init(void *card, ca_midi_t *midi, int device, char *name); | 66 | int ca_midi_init(void *card, struct snd_ca_midi *midi, int device, char *name); |
68 | |||
69 | |||