From a4ebbd18b1985535eea14694cd86c6cd9dd9f0ad Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Mon, 29 Aug 2011 14:14:06 +0300 Subject: omap1: convert to memory API (part III) Acked-by: Peter Maydell Signed-off-by: Avi Kivity --- hw/omap.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'hw/omap.h') diff --git a/hw/omap.h b/hw/omap.h index cb3b524cd7..059b48f3a6 100644 --- a/hw/omap.h +++ b/hw/omap.h @@ -692,7 +692,8 @@ struct uWireSlave { void *opaque; }; struct omap_uwire_s; -struct omap_uwire_s *omap_uwire_init(target_phys_addr_t base, +struct omap_uwire_s *omap_uwire_init(MemoryRegion *system_memory, + target_phys_addr_t base, qemu_irq *irq, qemu_irq dma, omap_clk clk); void omap_uwire_attach(struct omap_uwire_s *s, uWireSlave *slave, int chipselect); @@ -731,7 +732,8 @@ struct I2SCodec { } in, out; }; struct omap_mcbsp_s; -struct omap_mcbsp_s *omap_mcbsp_init(target_phys_addr_t base, +struct omap_mcbsp_s *omap_mcbsp_init(MemoryRegion *system_memory, + target_phys_addr_t base, qemu_irq *irq, qemu_irq *dma, omap_clk clk); void omap_mcbsp_i2s_attach(struct omap_mcbsp_s *s, I2SCodec *slave); @@ -837,6 +839,8 @@ struct omap_mpu_state_s { MemoryRegion tcmi_iomem; MemoryRegion clkm_iomem; MemoryRegion clkdsp_iomem; + MemoryRegion pwl_iomem; + MemoryRegion pwt_iomem; struct omap_dma_port_if_s { uint32_t (*read[3])(struct omap_mpu_state_s *s, -- cgit v1.2.1