From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57887) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VBnka-0003CL-Pk for qemu-devel@nongnu.org; Tue, 20 Aug 2013 11:21:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VBnkM-0000YY-Dz for qemu-devel@nongnu.org; Tue, 20 Aug 2013 11:21:40 -0400 Received: from cantor2.suse.de ([195.135.220.15]:59746 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VBnkM-0000Xi-3V for qemu-devel@nongnu.org; Tue, 20 Aug 2013 11:21:26 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 20 Aug 2013 17:21:15 +0200 Message-Id: <1377012076-7035-24-git-send-email-afaerber@suse.de> In-Reply-To: <1377012076-7035-1-git-send-email-afaerber@suse.de> References: <1377012076-7035-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v3 23/24] arm11mpcore: Prepare for QOM embedding List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Paul Brook Move state struct, type constant and cast macro to a new header. Signed-off-by: Andreas F=C3=A4rber --- hw/cpu/arm11mpcore.c | 27 +-------------------------- include/hw/cpu/arm11mpcore.h | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 26 deletions(-) create mode 100644 include/hw/cpu/arm11mpcore.h diff --git a/hw/cpu/arm11mpcore.c b/hw/cpu/arm11mpcore.c index 4872205..ec7c7f1 100644 --- a/hw/cpu/arm11mpcore.c +++ b/hw/cpu/arm11mpcore.c @@ -7,33 +7,8 @@ * This code is licensed under the GPL. */ =20 -#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. */ =20 =20 static void mpcore_priv_set_irq(void *opaque, int irq, int level) diff --git a/include/hw/cpu/arm11mpcore.h b/include/hw/cpu/arm11mpcore.h new file mode 100644 index 0000000..6196109 --- /dev/null +++ b/include/hw/cpu/arm11mpcore.h @@ -0,0 +1,35 @@ +/* + * ARM11MPCore internal peripheral emulation. + * + * Copyright (c) 2006-2007 CodeSourcery. + * Written by Paul Brook + * + * This code is licensed under the GPL. + */ + +#ifndef HW_CPU_ARM11MPCORE_H +#define HW_CPU_ARM11MPCORE_H + +#include "hw/sysbus.h" +#include "hw/misc/arm11scu.h" +#include "hw/intc/arm_gic.h" +#include "hw/timer/arm_mptimer.h" + +#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; + +#endif --=20 1.8.1.4