summaryrefslogtreecommitdiff
path: root/hw/arm-misc.h
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2011-07-25 14:27:01 +0300
committerAvi Kivity <avi@redhat.com>2011-08-24 20:17:51 +0300
commitfbe15adf8ed7c3ec41ff44fadabafb3175eb88cc (patch)
tree7d91ffe115c7349034751d9bad904df46d92ddeb /hw/arm-misc.h
parent4c390a1d32b59c49fbb89e73b1d21fde78e0168d (diff)
downloadqemu-fbe15adf8ed7c3ec41ff44fadabafb3175eb88cc.tar.gz
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.h5
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 */