From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Jtk4g-0001PY-Py for qemu-devel@nongnu.org; Wed, 07 May 2008 09:52:50 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Jtk4g-0001PL-C8 for qemu-devel@nongnu.org; Wed, 07 May 2008 09:52:50 -0400 Received: from [199.232.76.173] (port=42486 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Jtk4g-0001PC-89 for qemu-devel@nongnu.org; Wed, 07 May 2008 09:52:50 -0400 Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Jtk4f-0003o2-Sw for qemu-devel@nongnu.org; Wed, 07 May 2008 09:52:50 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1Jtk4f-00076i-A7 for qemu-devel@nongnu.org; Wed, 07 May 2008 13:52:49 +0000 Received: from balrog by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1Jtk4f-00076e-4G for qemu-devel@nongnu.org; Wed, 07 May 2008 13:52:49 +0000 MIME-Version: 1.0 Errors-To: balrog Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Andrzej Zaborowski Message-Id: Date: Wed, 07 May 2008 13:52:49 +0000 Subject: [Qemu-devel] [4373] Avoid arithmetics on void * in MusicPal audio code (Jan Kiszka). Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Revision: 4373 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4373 Author: balrog Date: 2008-05-07 13:52:48 +0000 (Wed, 07 May 2008) Log Message: ----------- Avoid arithmetics on void * in MusicPal audio code (Jan Kiszka). Modified Paths: -------------- trunk/hw/musicpal.c Modified: trunk/hw/musicpal.c =================================================================== --- trunk/hw/musicpal.c 2008-05-07 13:47:01 UTC (rev 4372) +++ trunk/hw/musicpal.c 2008-05-07 13:52:48 UTC (rev 4373) @@ -244,7 +244,7 @@ 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 @@ { 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 @@ 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 @@ 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++); } } }