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

Avoid arithmetics on void * in MusicPal audio code (Jan Kiszka).

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4373 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
balrog 2008-05-07 13:52:48 +00:00
parent 58565070ee
commit a350e69424
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/musicpal.c
View File

@ -244,7 +244,7 @@ typedef struct musicpal_audio_state {
uint32_t status;
uint32_t irq_enable;
unsigned long phys_buf;
void *target_buffer;
int8_t *target_buffer;
unsigned int threshold;
unsigned int play_pos;
unsigned int last_free;
@ -256,7 +256,7 @@ static void audio_callback(void *opaque, int free_out, int free_in)
{
musicpal_audio_state *s = opaque;
int16_t *codec_buffer;
void *mem_buffer;
int8_t *mem_buffer;
int pos, block_size;
if (!(s->playback_mode & MP_AUDIO_PLAYBACK_EN))
@ -277,8 +277,8 @@ static void audio_callback(void *opaque, int free_out, int free_in)
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++ = *(uint16_t *)mem_buffer;
*codec_buffer++ = *(uint16_t *)mem_buffer;
*codec_buffer++ = *(int16_t *)mem_buffer;
*codec_buffer++ = *(int16_t *)mem_buffer;
mem_buffer += 2;
}
} else
@ -288,14 +288,14 @@ static void audio_callback(void *opaque, int free_out, int free_in)
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 * *mem_buffer);
*codec_buffer++ = cpu_to_le16(256 * *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 * *mem_buffer++);
*codec_buffer++ = cpu_to_le16(256 * *mem_buffer++);
}
}
}