diff options
| author | Avi Kivity <avi@redhat.com> | 2011-08-30 14:46:53 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2011-09-21 11:14:38 +0300 |
| commit | 90aeba9dac1e99bfbe2d44867ec44b32b0780577 (patch) | |
| tree | e52b77a2a90a4c4f9af84d3242ce3129dede56df /hw/omap1.c | |
| parent | 9898b79abe32c5521ef365207d8a1db6c3a6e206 (diff) | |
| download | qemu-90aeba9dac1e99bfbe2d44867ec44b32b0780577.tar.gz | |
soc_dma: drop soc_dma_port_add_mem_ram()
It's a trivial wrapper for soc_dma_port_add_mem(), which makes
the memory API conversion more difficult because it takes a ram
addr_t. Drop.
Acked-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'hw/omap1.c')
| -rw-r--r-- | hw/omap1.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/omap1.c b/hw/omap1.c index 09eb363cbc..4b2abb97ca 100644 --- a/hw/omap1.c +++ b/hw/omap1.c @@ -3848,10 +3848,10 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegion *system_memory, s->port[tipb_mpui].addr_valid = omap_validate_tipb_mpui_addr; /* Register SDRAM and SRAM DMA ports for fast transfers. */ - soc_dma_port_add_mem_ram(s->dma, - emiff_base, OMAP_EMIFF_BASE, s->sdram_size); - soc_dma_port_add_mem_ram(s->dma, - imif_base, OMAP_IMIF_BASE, s->sram_size); + soc_dma_port_add_mem(s->dma, qemu_get_ram_ptr(emiff_base), + OMAP_EMIFF_BASE, s->sdram_size); + soc_dma_port_add_mem(s->dma, qemu_get_ram_ptr(imif_base), + OMAP_IMIF_BASE, s->sram_size); s->timer[0] = omap_mpu_timer_init(system_memory, 0xfffec500, s->irq[0][OMAP_INT_TIMER1], |