From: Jan Kiszka <jan.kiszka@web.de>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] Re: [4363] MusicPal: fix gcc4 build (Jan Kiszka).
Date: Tue, 06 May 2008 18:02:18 +0200 [thread overview]
Message-ID: <4820810A.6060607@web.de> (raw)
In-Reply-To: <200805061625.39329.paul@codesourcery.com>
Paul Brook wrote:
>> - int16_t *codec_buffer, *mem_buffer;
>> + int16_t *codec_buffer;
>> + void *mem_buffer;
>> ...
>> + mem_buffer += 2;
>
> I really dislike doing arithmetic on a void*.
Only fair. Version below should be better (in several ways).
Index: qemu/hw/musicpal.c
===================================================================
--- qemu/hw/musicpal.c (Revision 4365)
+++ qemu/hw/musicpal.c (Arbeitskopie)
@@ -256,7 +256,7 @@ static void audio_callback(void *opaque,
{
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,
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,
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++);
}
}
}
next prev parent reply other threads:[~2008-05-06 16:02 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-06 15:01 [Qemu-devel] [4363] MusicPal: fix gcc4 build (Jan Kiszka) Andrzej Zaborowski
2008-05-06 15:25 ` Paul Brook
2008-05-06 16:02 ` Jan Kiszka [this message]
2008-05-07 11:39 ` [Qemu-devel] " andrzej zaborowski
2008-05-07 11:53 ` Paul Brook
2008-05-07 12:01 ` Daniel P. Berrange
2008-05-07 12:26 ` Andreas Schwab
2008-05-07 12:04 ` Andreas Schwab
2008-05-07 13:53 ` andrzej zaborowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4820810A.6060607@web.de \
--to=jan.kiszka@web.de \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).