aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/emu10k1/voice.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2005-11-17 08:50:13 -0500
committerJaroslav Kysela <perex@suse.cz>2006-01-03 06:18:47 -0500
commiteb4698f347ec908c365504c4edddadd1acd406ea (patch)
tree4962019c8bf4a52e35ab55137e17aa150edf9661 /sound/pci/emu10k1/voice.c
parent3d19f804ef5f1d15fe001fc8d1ed58fac9d591fb (diff)
[ALSA] Remove xxx_t typedefs: PCI emu10k1
Modules: EMU10K1/EMU10K2 driver Remove xxx_t typedefs from the PCI emu10k1 driver. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/emu10k1/voice.c')
-rw-r--r--sound/pci/emu10k1/voice.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/sound/pci/emu10k1/voice.c b/sound/pci/emu10k1/voice.c
index d251d3440eec..56ffb7dc3ee2 100644
--- a/sound/pci/emu10k1/voice.c
+++ b/sound/pci/emu10k1/voice.c
@@ -45,9 +45,10 @@
45 * --rlrevell 45 * --rlrevell
46 */ 46 */
47 47
48static int voice_alloc(emu10k1_t *emu, emu10k1_voice_type_t type, int number, emu10k1_voice_t **rvoice) 48static int voice_alloc(struct snd_emu10k1 *emu, int type, int number,
49 struct snd_emu10k1_voice **rvoice)
49{ 50{
50 emu10k1_voice_t *voice; 51 struct snd_emu10k1_voice *voice;
51 int i, j, k, first_voice, last_voice, skip; 52 int i, j, k, first_voice, last_voice, skip;
52 53
53 *rvoice = NULL; 54 *rvoice = NULL;
@@ -105,7 +106,8 @@ static int voice_alloc(emu10k1_t *emu, emu10k1_voice_type_t type, int number, em
105 return 0; 106 return 0;
106} 107}
107 108
108int snd_emu10k1_voice_alloc(emu10k1_t *emu, emu10k1_voice_type_t type, int number, emu10k1_voice_t **rvoice) 109int snd_emu10k1_voice_alloc(struct snd_emu10k1 *emu, int type, int number,
110 struct snd_emu10k1_voice **rvoice)
109{ 111{
110 unsigned long flags; 112 unsigned long flags;
111 int result; 113 int result;
@@ -123,7 +125,7 @@ int snd_emu10k1_voice_alloc(emu10k1_t *emu, emu10k1_voice_type_t type, int numbe
123 if (emu->get_synth_voice) { 125 if (emu->get_synth_voice) {
124 result = emu->get_synth_voice(emu); 126 result = emu->get_synth_voice(emu);
125 if (result >= 0) { 127 if (result >= 0) {
126 emu10k1_voice_t *pvoice = &emu->voices[result]; 128 struct snd_emu10k1_voice *pvoice = &emu->voices[result];
127 pvoice->interrupt = NULL; 129 pvoice->interrupt = NULL;
128 pvoice->use = pvoice->pcm = pvoice->synth = pvoice->midi = pvoice->efx = 0; 130 pvoice->use = pvoice->pcm = pvoice->synth = pvoice->midi = pvoice->efx = 0;
129 pvoice->epcm = NULL; 131 pvoice->epcm = NULL;
@@ -137,7 +139,8 @@ int snd_emu10k1_voice_alloc(emu10k1_t *emu, emu10k1_voice_type_t type, int numbe
137 return result; 139 return result;
138} 140}
139 141
140int snd_emu10k1_voice_free(emu10k1_t *emu, emu10k1_voice_t *pvoice) 142int snd_emu10k1_voice_free(struct snd_emu10k1 *emu,
143 struct snd_emu10k1_voice *pvoice)
141{ 144{
142 unsigned long flags; 145 unsigned long flags;
143 146