diff options
author | Takashi Iwai <tiwai@suse.de> | 2005-11-17 08:12:45 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 06:18:01 -0500 |
commit | e1fad17bb4084dc7c435360185417aed55656ec8 (patch) | |
tree | f374fc6324e0af415bac8f8f7e24bc2f2e42e4bc /include/sound/mpu401.h | |
parent | 87e1f0e2b206eaf8265997a8d0cb7126ea11c844 (diff) |
[ALSA] Remove xxx_t typedefs: MPU401
Modules: MPU401 UART
Remove xxx_t typedefs from the MPU401-UART and MPU401 drivers
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound/mpu401.h')
-rw-r--r-- | include/sound/mpu401.h | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/include/sound/mpu401.h b/include/sound/mpu401.h index ae39e38bf996..8e97ace78f16 100644 --- a/include/sound/mpu401.h +++ b/include/sound/mpu401.h | |||
@@ -58,10 +58,8 @@ | |||
58 | #define MPU401_MODE_INPUT_TIMER (1<<0) | 58 | #define MPU401_MODE_INPUT_TIMER (1<<0) |
59 | #define MPU401_MODE_OUTPUT_TIMER (1<<1) | 59 | #define MPU401_MODE_OUTPUT_TIMER (1<<1) |
60 | 60 | ||
61 | typedef struct _snd_mpu401 mpu401_t; | 61 | struct snd_mpu401 { |
62 | 62 | struct snd_rawmidi *rmidi; | |
63 | struct _snd_mpu401 { | ||
64 | snd_rawmidi_t *rmidi; | ||
65 | 63 | ||
66 | unsigned short hardware; /* MPU401_HW_XXXX */ | 64 | unsigned short hardware; /* MPU401_HW_XXXX */ |
67 | unsigned long port; /* base port of MPU-401 chip */ | 65 | unsigned long port; /* base port of MPU-401 chip */ |
@@ -73,14 +71,14 @@ struct _snd_mpu401 { | |||
73 | unsigned long mode; /* MPU401_MODE_XXXX */ | 71 | unsigned long mode; /* MPU401_MODE_XXXX */ |
74 | int timer_invoked; | 72 | int timer_invoked; |
75 | 73 | ||
76 | int (*open_input) (mpu401_t * mpu); | 74 | int (*open_input) (struct snd_mpu401 * mpu); |
77 | void (*close_input) (mpu401_t * mpu); | 75 | void (*close_input) (struct snd_mpu401 * mpu); |
78 | int (*open_output) (mpu401_t * mpu); | 76 | int (*open_output) (struct snd_mpu401 * mpu); |
79 | void (*close_output) (mpu401_t * mpu); | 77 | void (*close_output) (struct snd_mpu401 * mpu); |
80 | void *private_data; | 78 | void *private_data; |
81 | 79 | ||
82 | snd_rawmidi_substream_t *substream_input; | 80 | struct snd_rawmidi_substream *substream_input; |
83 | snd_rawmidi_substream_t *substream_output; | 81 | struct snd_rawmidi_substream *substream_output; |
84 | 82 | ||
85 | spinlock_t input_lock; | 83 | spinlock_t input_lock; |
86 | spinlock_t output_lock; | 84 | spinlock_t output_lock; |
@@ -88,8 +86,8 @@ struct _snd_mpu401 { | |||
88 | 86 | ||
89 | struct timer_list timer; | 87 | struct timer_list timer; |
90 | 88 | ||
91 | void (*write) (mpu401_t * mpu, unsigned char data, unsigned long addr); | 89 | void (*write) (struct snd_mpu401 * mpu, unsigned char data, unsigned long addr); |
92 | unsigned char (*read) (mpu401_t * mpu, unsigned long addr); | 90 | unsigned char (*read) (struct snd_mpu401 *mpu, unsigned long addr); |
93 | }; | 91 | }; |
94 | 92 | ||
95 | /* I/O ports */ | 93 | /* I/O ports */ |
@@ -103,13 +101,13 @@ struct _snd_mpu401 { | |||
103 | 101 | ||
104 | irqreturn_t snd_mpu401_uart_interrupt(int irq, void *dev_id, struct pt_regs *regs); | 102 | irqreturn_t snd_mpu401_uart_interrupt(int irq, void *dev_id, struct pt_regs *regs); |
105 | 103 | ||
106 | int snd_mpu401_uart_new(snd_card_t * card, | 104 | int snd_mpu401_uart_new(struct snd_card *card, |
107 | int device, | 105 | int device, |
108 | unsigned short hardware, | 106 | unsigned short hardware, |
109 | unsigned long port, | 107 | unsigned long port, |
110 | int integrated, | 108 | int integrated, |
111 | int irq, | 109 | int irq, |
112 | int irq_flags, | 110 | int irq_flags, |
113 | snd_rawmidi_t ** rrawmidi); | 111 | struct snd_rawmidi ** rrawmidi); |
114 | 112 | ||
115 | #endif /* __SOUND_MPU401_H */ | 113 | #endif /* __SOUND_MPU401_H */ |