Commit 6fe7a1ce authored by Jaroslav Kysela's avatar Jaroslav Kysela

[ALSA] Fix comiple with old gcc

EMU10K1/EMU10K2 driver
Fix compile with old gcc.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 7c3f7e28
...@@ -266,6 +266,7 @@ static void snd_emu10k1_pcm_init_voice(emu10k1_t *emu, ...@@ -266,6 +266,7 @@ static void snd_emu10k1_pcm_init_voice(emu10k1_t *emu,
unsigned char send_routing[8]; unsigned char send_routing[8];
unsigned long flags; unsigned long flags;
unsigned int pitch_target; unsigned int pitch_target;
unsigned int ccis;
voice = evoice->number; voice = evoice->number;
if (evoice->epcm->type == PLAYBACK_EFX) if (evoice->epcm->type == PLAYBACK_EFX)
...@@ -303,7 +304,7 @@ static void snd_emu10k1_pcm_init_voice(emu10k1_t *emu, ...@@ -303,7 +304,7 @@ static void snd_emu10k1_pcm_init_voice(emu10k1_t *emu,
memcpy(send_amount, &mix->send_volume[tmp][0], 8); memcpy(send_amount, &mix->send_volume[tmp][0], 8);
} }
unsigned int ccis = stereo ? 28 : 30; ccis = stereo ? 28 : 30;
if (w_16) if (w_16)
ccis *= 2; ccis *= 2;
...@@ -492,6 +493,8 @@ static int snd_emu10k1_efx_playback_prepare(snd_pcm_substream_t * substream) ...@@ -492,6 +493,8 @@ static int snd_emu10k1_efx_playback_prepare(snd_pcm_substream_t * substream)
snd_pcm_runtime_t *runtime = substream->runtime; snd_pcm_runtime_t *runtime = substream->runtime;
emu10k1_pcm_t *epcm = runtime->private_data; emu10k1_pcm_t *epcm = runtime->private_data;
unsigned int start_addr, end_addr; unsigned int start_addr, end_addr;
unsigned int channel_size;
int i;
start_addr = epcm->start_addr; start_addr = epcm->start_addr;
end_addr = epcm->start_addr + snd_pcm_lib_buffer_bytes(substream); end_addr = epcm->start_addr + snd_pcm_lib_buffer_bytes(substream);
...@@ -499,8 +502,6 @@ static int snd_emu10k1_efx_playback_prepare(snd_pcm_substream_t * substream) ...@@ -499,8 +502,6 @@ static int snd_emu10k1_efx_playback_prepare(snd_pcm_substream_t * substream)
/* /*
* the kX driver leaves some space between voices * the kX driver leaves some space between voices
*/ */
unsigned int channel_size;
int i;
channel_size = ( end_addr - start_addr ) / NUM_EFX_PLAYBACK; channel_size = ( end_addr - start_addr ) / NUM_EFX_PLAYBACK;
snd_emu10k1_pcm_init_voice(emu, 1, 1, epcm->extra, snd_emu10k1_pcm_init_voice(emu, 1, 1, epcm->extra,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment