From 7b960dc37df088f9ca71bdc2a611864eae38c5c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 19 Aug 2013 01:27:19 +0200 Subject: arm11mpcore: Prepare for QOM embedding MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move state struct, type constant and cast macro to a new header. Reviewed-by: Peter Maydell Signed-off-by: Andreas Färber --- hw/cpu/arm11mpcore.c | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) (limited to 'hw/cpu') diff --git a/hw/cpu/arm11mpcore.c b/hw/cpu/arm11mpcore.c index 578e3d3..0ec27c7 100644 --- a/hw/cpu/arm11mpcore.c +++ b/hw/cpu/arm11mpcore.c @@ -7,33 +7,8 @@ * This code is licensed under the GPL. */ -#include "hw/sysbus.h" -#include "hw/misc/arm11scu.h" -#include "hw/intc/arm_gic.h" +#include "hw/cpu/arm11mpcore.h" #include "hw/intc/realview_gic.h" -#include "hw/timer/arm_mptimer.h" -#include "qemu/timer.h" - -/* MPCore private memory region. */ - -#define TYPE_ARM11MPCORE_PRIV "arm11mpcore_priv" -#define ARM11MPCORE_PRIV(obj) \ - OBJECT_CHECK(ARM11MPCorePriveState, (obj), TYPE_ARM11MPCORE_PRIV) - -typedef struct ARM11MPCorePriveState { - SysBusDevice parent_obj; - - uint32_t num_cpu; - MemoryRegion container; - uint32_t num_irq; - - ARM11SCUState scu; - GICState gic; - ARMMPTimerState mptimer; - ARMMPTimerState wdtimer; -} ARM11MPCorePriveState; - -/* Per-CPU private memory mapped IO. */ static void mpcore_priv_set_irq(void *opaque, int irq, int level) -- cgit v1.1