diff options
author | Avi Kivity <avi@redhat.com> | 2011-07-25 14:27:01 +0300 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2011-09-04 17:46:50 +0300 |
commit | 7d6f78cfacf702d902951924cb437ef2460b36ce (patch) | |
tree | a8a9a4e07b0fc254784121f06a2ffaab2d8e7014 /hw/arm-misc.h | |
parent | 72e4d2554d16af85b7cdf7dfff8143c40ef245f1 (diff) | |
download | qemu-7d6f78cfacf702d902951924cb437ef2460b36ce.zip |
armv7m: convert to memory API
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'hw/arm-misc.h')
-rw-r--r-- | hw/arm-misc.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/hw/arm-misc.h b/hw/arm-misc.h index f8a747289b..af403a159a 100644 --- a/hw/arm-misc.h +++ b/hw/arm-misc.h @@ -11,13 +11,16 @@ #ifndef ARM_MISC_H #define ARM_MISC_H 1 +#include "memory.h" + /* The CPU is also modeled as an interrupt controller. */ #define ARM_PIC_CPU_IRQ 0 #define ARM_PIC_CPU_FIQ 1 qemu_irq *arm_pic_init_cpu(CPUState *env); /* armv7m.c */ -qemu_irq *armv7m_init(int flash_size, int sram_size, +qemu_irq *armv7m_init(MemoryRegion *address_space_mem, + int flash_size, int sram_size, const char *kernel_filename, const char *cpu_model); /* arm_boot.c */ |