OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

MusicPal: fix gcc4 build (Jan Kiszka).

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4363 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
balrog 2008-05-06 15:01:12 +00:00
parent 894efddb50
commit 4f3cb3be18
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/musicpal.c
View File

@ -255,7 +255,8 @@ typedef struct musicpal_audio_state {
static void audio_callback(void *opaque, int free_out, int free_in) static void audio_callback(void *opaque, int free_out, int free_in)
{ {
musicpal_audio_state *s = opaque; musicpal_audio_state *s = opaque;
int16_t *codec_buffer, *mem_buffer; int16_t *codec_buffer;
void *mem_buffer;
int pos, block_size; int pos, block_size;
if (!(s->playback_mode & MP_AUDIO_PLAYBACK_EN)) if (!(s->playback_mode & MP_AUDIO_PLAYBACK_EN))
@ -276,8 +277,9 @@ static void audio_callback(void *opaque, int free_out, int free_in)
if (s->playback_mode & MP_AUDIO_MONO) { if (s->playback_mode & MP_AUDIO_MONO) {
codec_buffer = wm8750_dac_buffer(s->wm, block_size >> 1); codec_buffer = wm8750_dac_buffer(s->wm, block_size >> 1);
for (pos = 0; pos < block_size; pos += 2) { for (pos = 0; pos < block_size; pos += 2) {
*codec_buffer++ = *mem_buffer; *codec_buffer++ = *(uint16_t *)mem_buffer;
*codec_buffer++ = *mem_buffer++; *codec_buffer++ = *(uint16_t *)mem_buffer;
mem_buffer += 2;
} }
} else } else
memcpy(wm8750_dac_buffer(s->wm, block_size >> 2), memcpy(wm8750_dac_buffer(s->wm, block_size >> 2),
@ -286,14 +288,14 @@ static void audio_callback(void *opaque, int free_out, int free_in)
if (s->playback_mode & MP_AUDIO_MONO) { if (s->playback_mode & MP_AUDIO_MONO) {
codec_buffer = wm8750_dac_buffer(s->wm, block_size); codec_buffer = wm8750_dac_buffer(s->wm, block_size);
for (pos = 0; pos < block_size; pos++) { for (pos = 0; pos < block_size; pos++) {
*codec_buffer++ = cpu_to_le16(256 * *((int8_t *)mem_buffer)); *codec_buffer++ = cpu_to_le16(256 * *(int8_t *)mem_buffer);
*codec_buffer++ = cpu_to_le16(256 * *((int8_t *)mem_buffer)++); *codec_buffer++ = cpu_to_le16(256 * *(int8_t *)mem_buffer++);
} }
} else { } else {
codec_buffer = wm8750_dac_buffer(s->wm, block_size >> 1); codec_buffer = wm8750_dac_buffer(s->wm, block_size >> 1);
for (pos = 0; pos < block_size; pos += 2) { for (pos = 0; pos < block_size; pos += 2) {
*codec_buffer++ = cpu_to_le16(256 * *((int8_t *)mem_buffer)++); *codec_buffer++ = cpu_to_le16(256 * *(int8_t *)mem_buffer++);
*codec_buffer++ = cpu_to_le16(256 * *((int8_t *)mem_buffer)++); *codec_buffer++ = cpu_to_le16(256 * *(int8_t *)mem_buffer++);
} }
} }
} }