From 90aeba9dac1e99bfbe2d44867ec44b32b0780577 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Tue, 30 Aug 2011 14:46:53 +0300 Subject: 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 Signed-off-by: Avi Kivity --- hw/omap1.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'hw/omap1.c') 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], -- cgit v1.2.1