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/ac97.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/ac97.c')
| -rw-r--r-- | hw/ac97.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/ac97.c b/hw/ac97.c index bc69d4e345..6800af43a4 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; |