git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
sound
/
pci
/
emu10k1
/
voice.c
diff --git
a/sound/pci/emu10k1/voice.c
b/sound/pci/emu10k1/voice.c
index
d251d34
..
56ffb7d
100644
(file)
--- a/
sound/pci/emu10k1/voice.c
+++ b/
sound/pci/emu10k1/voice.c
@@
-45,9
+45,10
@@
* --rlrevell
*/
* --rlrevell
*/
-static int voice_alloc(emu10k1_t *emu, emu10k1_voice_type_t type, int number, emu10k1_voice_t **rvoice)
+static int voice_alloc(struct snd_emu10k1 *emu, int type, int number,
+ struct snd_emu10k1_voice **rvoice)
{
{
-
emu10k1_voice_t
*voice;
+
struct snd_emu10k1_voice
*voice;
int i, j, k, first_voice, last_voice, skip;
*rvoice = NULL;
int i, j, k, first_voice, last_voice, skip;
*rvoice = NULL;
@@
-105,7
+106,8
@@
static int voice_alloc(emu10k1_t *emu, emu10k1_voice_type_t type, int number, em
return 0;
}
return 0;
}
-int snd_emu10k1_voice_alloc(emu10k1_t *emu, emu10k1_voice_type_t type, int number, emu10k1_voice_t **rvoice)
+int snd_emu10k1_voice_alloc(struct snd_emu10k1 *emu, int type, int number,
+ struct snd_emu10k1_voice **rvoice)
{
unsigned long flags;
int result;
{
unsigned long flags;
int result;
@@
-123,7
+125,7
@@
int snd_emu10k1_voice_alloc(emu10k1_t *emu, emu10k1_voice_type_t type, int numbe
if (emu->get_synth_voice) {
result = emu->get_synth_voice(emu);
if (result >= 0) {
if (emu->get_synth_voice) {
result = emu->get_synth_voice(emu);
if (result >= 0) {
-
emu10k1_voice_t
*pvoice = &emu->voices[result];
+
struct snd_emu10k1_voice
*pvoice = &emu->voices[result];
pvoice->interrupt = NULL;
pvoice->use = pvoice->pcm = pvoice->synth = pvoice->midi = pvoice->efx = 0;
pvoice->epcm = NULL;
pvoice->interrupt = NULL;
pvoice->use = pvoice->pcm = pvoice->synth = pvoice->midi = pvoice->efx = 0;
pvoice->epcm = NULL;
@@
-137,7
+139,8
@@
int snd_emu10k1_voice_alloc(emu10k1_t *emu, emu10k1_voice_type_t type, int numbe
return result;
}
return result;
}
-int snd_emu10k1_voice_free(emu10k1_t *emu, emu10k1_voice_t *pvoice)
+int snd_emu10k1_voice_free(struct snd_emu10k1 *emu,
+ struct snd_emu10k1_voice *pvoice)
{
unsigned long flags;
{
unsigned long flags;