[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/12] ac97: Use PCI DMA stub functions
From: |
David Gibson |
Subject: |
[Qemu-devel] [PATCH 04/12] ac97: Use PCI DMA stub functions |
Date: |
Fri, 14 Oct 2011 20:20:55 +1100 |
From: Eduard - Gabriel Munteanu <address@hidden>
This updates the ac97 device emulation to use the explicit PCI DMA
functions, instead of directly calling physical memory access functions.
Signed-off-by: Eduard - Gabriel Munteanu <address@hidden>
Signed-off-by: David Gibson <address@hidden>
---
hw/ac97.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/hw/ac97.c b/hw/ac97.c
index bc69d4e..6800af4 100644
--- a/hw/ac97.c
+++ b/hw/ac97.c
@@ -18,6 +18,7 @@
#include "audiodev.h"
#include "audio/audio.h"
#include "pci.h"
+#include "dma.h"
enum {
AC97_Reset = 0x00,
@@ -224,7 +225,7 @@ static void fetch_bd (AC97LinkState *s, AC97BusMasterRegs
*r)
{
uint8_t b[8];
- cpu_physical_memory_read (r->bdbar + r->civ * 8, b, 8);
+ pci_dma_read (&s->dev, r->bdbar + r->civ * 8, b, 8);
r->bd_valid = 1;
r->bd.addr = le32_to_cpu (*(uint32_t *) &b[0]) & ~3;
r->bd.ctl_len = le32_to_cpu (*(uint32_t *) &b[4]);
@@ -973,7 +974,7 @@ static int write_audio (AC97LinkState *s, AC97BusMasterRegs
*r,
while (temp) {
int copied;
to_copy = audio_MIN (temp, sizeof (tmpbuf));
- cpu_physical_memory_read (addr, tmpbuf, to_copy);
+ pci_dma_read (&s->dev, addr, tmpbuf, to_copy);
copied = AUD_write (s->voice_po, tmpbuf, to_copy);
dolog ("write_audio max=%x to_copy=%x copied=%x\n",
max, to_copy, copied);
@@ -1054,7 +1055,7 @@ static int read_audio (AC97LinkState *s,
AC97BusMasterRegs *r,
*stop = 1;
break;
}
- cpu_physical_memory_write (addr, tmpbuf, acquired);
+ pci_dma_write (&s->dev, addr, tmpbuf, acquired);
temp -= acquired;
addr += acquired;
nread += acquired;
--
1.7.6.3
- [Qemu-devel] [0/12] Preliminary work for IOMMU emulation support (v2), David Gibson, 2011/10/14
- [Qemu-devel] [PATCH 04/12] ac97: Use PCI DMA stub functions,
David Gibson <=
- [Qemu-devel] [PATCH 05/12] es1370: Use PCI DMA stub functions, David Gibson, 2011/10/14
- [Qemu-devel] [PATCH 01/12] Add stub functions for PCI device models to do PCI DMA, David Gibson, 2011/10/14
- [Qemu-devel] [PATCH 07/12] lsi53c895a: Use PCI DMA stub functions, David Gibson, 2011/10/14
- [Qemu-devel] [PATCH 03/12] eepro100: Use PCI DMA stub functions, David Gibson, 2011/10/14
- [Qemu-devel] [PATCH 06/12] e1000: Use PCI DMA stub functions, David Gibson, 2011/10/14
- [Qemu-devel] [PATCH 12/12] usb-uhci: Use PCI DMA stub functions, David Gibson, 2011/10/14
- [Qemu-devel] [PATCH 02/12] rtl8139: Use PCI DMA stub functions, David Gibson, 2011/10/14
- [Qemu-devel] [PATCH 10/12] PCI IDE: Use PCI DMA stub functions, David Gibson, 2011/10/14
- [Qemu-devel] [PATCH 08/12] pcnet-pci: Use PCI DMA stub functions, David Gibson, 2011/10/14
- [Qemu-devel] [PATCH 11/12] usb-ehci: Use PCI DMA stub functions, David Gibson, 2011/10/14