diff options
author | Hervé Poussineau <hpoussin@reactos.org> | 2015-06-03 22:45:37 +0200 |
---|---|---|
committer | Leon Alrae <leon.alrae@imgtec.com> | 2015-06-11 10:13:29 +0100 |
commit | dd8205130bab277a27889b6d3c0c6c7651585732 (patch) | |
tree | fd11ed50a5b4b158a0e95a3a893c26e12e27bba5 /hw/dma | |
parent | a3d586f704609a45b6037534cb2f34da5dfd8895 (diff) | |
download | qemu-dd8205130bab277a27889b6d3c0c6c7651585732.zip qemu-dd8205130bab277a27889b6d3c0c6c7651585732.tar.gz qemu-dd8205130bab277a27889b6d3c0c6c7651585732.tar.bz2 |
dma/rc4030: use AddressSpace and address_space_rw in users
Now that rc4030 internally uses an AddressSpace for DMA handling, make its root
memory region public. This is especially usefull for dp8393x netcard, which now
uses well known QEMU types and methods.
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Leon Alrae <leon.alrae@imgtec.com>
Diffstat (limited to 'hw/dma')
-rw-r--r-- | hw/dma/rc4030.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/hw/dma/rc4030.c b/hw/dma/rc4030.c index 84039dc..a0b617f 100644 --- a/hw/dma/rc4030.c +++ b/hw/dma/rc4030.c @@ -776,13 +776,6 @@ static void rc4030_save(QEMUFile *f, void *opaque) qemu_put_be32(f, s->itr); } -void rc4030_dma_memory_rw(void *opaque, hwaddr addr, uint8_t *buf, int len, int is_write) -{ - rc4030State *s = opaque; - address_space_rw(&s->dma_as, addr, MEMTXATTRS_UNSPECIFIED, buf, len, - is_write); -} - static void rc4030_do_dma(void *opaque, int n, uint8_t *buf, int len, int is_write) { rc4030State *s = opaque; @@ -869,9 +862,9 @@ static rc4030_dma *rc4030_allocate_dmas(void *opaque, int n) return s; } -void *rc4030_init(qemu_irq timer, qemu_irq jazz_bus, - qemu_irq **irqs, rc4030_dma **dmas, - MemoryRegion *sysmem) +MemoryRegion *rc4030_init(qemu_irq timer, qemu_irq jazz_bus, + qemu_irq **irqs, rc4030_dma **dmas, + MemoryRegion *sysmem) { rc4030State *s; int i; @@ -910,5 +903,5 @@ void *rc4030_init(qemu_irq timer, qemu_irq jazz_bus, &s->dma_mrs[i]); } address_space_init(&s->dma_as, &s->dma_mr, "rc4030-dma"); - return s; + return &s->dma_mr; } |