aboutsummaryrefslogtreecommitdiff
path: root/hw/omap.h
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2011-08-09 19:35:00 +0300
committerAvi Kivity <avi@redhat.com>2011-09-21 11:14:10 +0300
commit4b3fedf3a580fbd3dccaca80feaedbda2510d77c (patch)
treefc4c9e14dbfadd587772fcbb9e44c10033b2bcea /hw/omap.h
parent19b4a424d86f50131d68b9b2c28383bfc0566d31 (diff)
downloadqemu-4b3fedf3a580fbd3dccaca80feaedbda2510d77c.zip
qemu-4b3fedf3a580fbd3dccaca80feaedbda2510d77c.tar.gz
qemu-4b3fedf3a580fbd3dccaca80feaedbda2510d77c.tar.bz2
omap1: convert to memory API (part I)
Acked-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'hw/omap.h')
-rw-r--r--hw/omap.h11
1 files changed, 10 insertions, 1 deletions
diff --git a/hw/omap.h b/hw/omap.h
index d9ab006..eec8f04 100644
--- a/hw/omap.h
+++ b/hw/omap.h
@@ -826,6 +826,14 @@ struct omap_mpu_state_s {
qemu_irq wakeup;
+ MemoryRegion ulpd_pm_iomem;
+ MemoryRegion pin_cfg_iomem;
+ MemoryRegion id_iomem;
+ MemoryRegion id_iomem_e18;
+ MemoryRegion id_iomem_ed4;
+ MemoryRegion id_iomem_e20;
+ MemoryRegion mpui_iomem;
+
struct omap_dma_port_if_s {
uint32_t (*read[3])(struct omap_mpu_state_s *s,
target_phys_addr_t offset);
@@ -947,7 +955,8 @@ struct omap_mpu_state_s {
};
/* omap1.c */
-struct omap_mpu_state_s *omap310_mpu_init(unsigned long sdram_size,
+struct omap_mpu_state_s *omap310_mpu_init(MemoryRegion *system_memory,
+ unsigned long sdram_size,
const char *core);
/* omap2.c */