From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:36149) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1REdxA-0005LU-LC for qemu-devel@nongnu.org; Fri, 14 Oct 2011 05:21:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1REdx6-0006S9-5d for qemu-devel@nongnu.org; Fri, 14 Oct 2011 05:21:20 -0400 Received: from ozlabs.org ([203.10.76.45]:57778) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1REdx5-0006Qz-ON for qemu-devel@nongnu.org; Fri, 14 Oct 2011 05:21:16 -0400 From: David Gibson Date: Fri, 14 Oct 2011 20:20:56 +1100 Message-Id: <1318584063-1611-6-git-send-email-david@gibson.dropbear.id.au> In-Reply-To: <1318584063-1611-1-git-send-email-david@gibson.dropbear.id.au> References: <1318584063-1611-1-git-send-email-david@gibson.dropbear.id.au> Subject: [Qemu-devel] [PATCH 05/12] es1370: Use PCI DMA stub functions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: aliguori@us.ibm.com Cc: mst@redhat.com, joerg.roedel@amd.com, agraf@suse.de, qemu-devel@nongnu.org, avi@redhat.com, eduard.munteanu@linux360.ro, rth@twiddle.net From: Eduard - Gabriel Munteanu This updates the es1370 device emulation to use the explicit PCI DMA functions, instead of directly calling physical memory access functions. Signed-off-by: Eduard - Gabriel Munteanu Signed-off-by: David Gibson --- hw/es1370.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/es1370.c b/hw/es1370.c index 2daadde..c5c16b0 100644 --- a/hw/es1370.c +++ b/hw/es1370.c @@ -30,6 +30,7 @@ #include "audiodev.h" #include "audio/audio.h" #include "pci.h" +#include "dma.h" /* Missing stuff: SCTRL_P[12](END|ST)INC @@ -802,7 +803,7 @@ static void es1370_transfer_audio (ES1370State *s, struct chan *d, int loop_sel, if (!acquired) break; - cpu_physical_memory_write (addr, tmpbuf, acquired); + pci_dma_write (&s->dev, addr, tmpbuf, acquired); temp -= acquired; addr += acquired; @@ -816,7 +817,7 @@ static void es1370_transfer_audio (ES1370State *s, struct chan *d, int loop_sel, int copied, to_copy; to_copy = audio_MIN ((size_t) temp, sizeof (tmpbuf)); - cpu_physical_memory_read (addr, tmpbuf, to_copy); + pci_dma_read (&s->dev, addr, tmpbuf, to_copy); copied = AUD_write (voice, tmpbuf, to_copy); if (!copied) break; -- 1.7.6.3