diff options
| author | malc <av1474@comtv.ru> | 2011-11-02 02:16:34 +0400 |
|---|---|---|
| committer | malc <av1474@comtv.ru> | 2011-11-02 02:16:34 +0400 |
| commit | ef26ee0e6c67d415f8b22850f9f13a972ada8be1 (patch) | |
| tree | c18a9cc2a9f213c8a37473f9b7aa001a99898547 /hw/es1370.c | |
| parent | dd7b25b5b47df8aaf5580faaf3f60b2a1b779c37 (diff) | |
| parent | e1c2008af64487e7d3cec615612b7f467ebe9bc8 (diff) | |
| download | focaccia-qemu-ef26ee0e6c67d415f8b22850f9f13a972ada8be1.tar.gz focaccia-qemu-ef26ee0e6c67d415f8b22850f9f13a972ada8be1.zip | |
Merge branch 'master' of git://git.qemu.org/qemu
Diffstat (limited to 'hw/es1370.c')
| -rw-r--r-- | hw/es1370.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/es1370.c b/hw/es1370.c index 2daadde0e6..c5c16b0484 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; |