[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [4363] MusicPal: fix gcc4 build (Jan Kiszka).
From: |
Andrzej Zaborowski |
Subject: |
[Qemu-devel] [4363] MusicPal: fix gcc4 build (Jan Kiszka). |
Date: |
Tue, 06 May 2008 15:01:13 +0000 |
Revision: 4363
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4363
Author: balrog
Date: 2008-05-06 15:01:12 +0000 (Tue, 06 May 2008)
Log Message:
-----------
MusicPal: fix gcc4 build (Jan Kiszka).
Modified Paths:
--------------
trunk/hw/musicpal.c
Modified: trunk/hw/musicpal.c
===================================================================
--- trunk/hw/musicpal.c 2008-05-06 14:58:23 UTC (rev 4362)
+++ trunk/hw/musicpal.c 2008-05-06 15:01:12 UTC (rev 4363)
@@ -255,7 +255,8 @@
static void audio_callback(void *opaque, int free_out, int free_in)
{
musicpal_audio_state *s = opaque;
- int16_t *codec_buffer, *mem_buffer;
+ int16_t *codec_buffer;
+ void *mem_buffer;
int pos, block_size;
if (!(s->playback_mode & MP_AUDIO_PLAYBACK_EN))
@@ -276,8 +277,9 @@
if (s->playback_mode & MP_AUDIO_MONO) {
codec_buffer = wm8750_dac_buffer(s->wm, block_size >> 1);
for (pos = 0; pos < block_size; pos += 2) {
- *codec_buffer++ = *mem_buffer;
- *codec_buffer++ = *mem_buffer++;
+ *codec_buffer++ = *(uint16_t *)mem_buffer;
+ *codec_buffer++ = *(uint16_t *)mem_buffer;
+ mem_buffer += 2;
}
} else
memcpy(wm8750_dac_buffer(s->wm, block_size >> 2),
@@ -286,14 +288,14 @@
if (s->playback_mode & MP_AUDIO_MONO) {
codec_buffer = wm8750_dac_buffer(s->wm, block_size);
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 {
codec_buffer = wm8750_dac_buffer(s->wm, block_size >> 1);
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++);
}
}
}
- [Qemu-devel] [4363] MusicPal: fix gcc4 build (Jan Kiszka).,
Andrzej Zaborowski <=