From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Jpj4v-0006SI-CQ for qemu-devel@nongnu.org; Sat, 26 Apr 2008 08:00:29 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Jpj4u-0006Qz-HQ for qemu-devel@nongnu.org; Sat, 26 Apr 2008 08:00:28 -0400 Received: from [199.232.76.173] (port=43568 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Jpj4t-0006Qc-OY for qemu-devel@nongnu.org; Sat, 26 Apr 2008 08:00:27 -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 1Jpj4r-0003Ek-QA for qemu-devel@nongnu.org; Sat, 26 Apr 2008 08:00:26 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1Jpj4o-0005Nm-QI for qemu-devel@nongnu.org; Sat, 26 Apr 2008 12:00:23 +0000 Received: from balrog by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1Jpj4m-0005NG-5O for qemu-devel@nongnu.org; Sat, 26 Apr 2008 12:00:20 +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: Sat, 26 Apr 2008 12:00:20 +0000 Subject: [Qemu-devel] [4254] Let WM8750 users write to audio buffer directly. 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: 4254 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4254 Author: balrog Date: 2008-04-26 12:00:18 +0000 (Sat, 26 Apr 2008) Log Message: ----------- Let WM8750 users write to audio buffer directly. Modified Paths: -------------- trunk/hw/i2c.h trunk/hw/musicpal.c trunk/hw/wm8750.c Modified: trunk/hw/i2c.h =================================================================== --- trunk/hw/i2c.h 2008-04-26 01:43:07 UTC (rev 4253) +++ trunk/hw/i2c.h 2008-04-26 12:00:18 UTC (rev 4254) @@ -67,6 +67,8 @@ void (*data_req)(void *, int, int), void *opaque); void wm8750_dac_dat(void *opaque, uint32_t sample); uint32_t wm8750_adc_dat(void *opaque); +void *wm8750_dac_buffer(void *opaque, int samples); +void wm8750_dac_commit(void *opaque); /* ssd0303.c */ void ssd0303_init(DisplayState *ds, i2c_bus *bus, int address); Modified: trunk/hw/musicpal.c =================================================================== --- trunk/hw/musicpal.c 2008-04-26 01:43:07 UTC (rev 4253) +++ trunk/hw/musicpal.c 2008-04-26 12:00:18 UTC (rev 4254) @@ -254,7 +254,7 @@ static void audio_callback(void *opaque, int free_out, int free_in) { musicpal_audio_state *s = opaque; - int16_t channel[2]; + int16_t *codec_buffer; int pos, block_size; if (!(s->playback_mode & MP_AUDIO_PLAYBACK_EN)) @@ -270,17 +270,19 @@ return; if (s->playback_mode & MP_AUDIO_16BIT_SAMPLE) - for (pos = 0; pos < block_size; pos += 4) - wm8750_dac_dat(s->wm, - *(uint32_t *)(s->target_buffer + s->play_pos + pos)); - else + memcpy(wm8750_dac_buffer(s->wm, block_size >> 2), + (uint32_t *)(s->target_buffer + s->play_pos), + block_size); + else { + codec_buffer = wm8750_dac_buffer(s->wm, block_size >> 1); for (pos = 0; pos < block_size; pos += 2) { - channel[0] = cpu_to_le16(2 * + *codec_buffer++ = cpu_to_le16(2 * *(int8_t *)(s->target_buffer + s->play_pos + pos)); - channel[1] = cpu_to_le16(2 * + *codec_buffer++ = cpu_to_le16(2 * *(int8_t *)(s->target_buffer + s->play_pos + pos + 1)); - wm8750_dac_dat(s->wm, channel[0] | (channel[1] << 16)); } + } + wm8750_dac_commit(s->wm); s->last_free = free_out - block_size; Modified: trunk/hw/wm8750.c =================================================================== --- trunk/hw/wm8750.c 2008-04-26 01:43:07 UTC (rev 4253) +++ trunk/hw/wm8750.c 2008-04-26 12:00:18 UTC (rev 4254) @@ -627,6 +627,24 @@ wm8750_out_flush(s); } +void *wm8750_dac_buffer(void *opaque, int samples) +{ + struct wm8750_s *s = (struct wm8750_s *) opaque; + /* XXX: Should check if there are samples free samples available */ + void *ret = s->data_out + s->idx_out; + + s->idx_out += samples << 2; + s->req_out -= samples << 2; + return ret; +} + +void wm8750_dac_commit(void *opaque) +{ + struct wm8750_s *s = (struct wm8750_s *) opaque; + + return wm8750_out_flush(s); +} + uint32_t wm8750_adc_dat(void *opaque) { struct wm8750_s *s = (struct wm8750_s *) opaque;