[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC 10/15] cpu/a9mpcore: Prepare for QOM embedding
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH RFC 10/15] cpu/a9mpcore: Prepare for QOM embedding |
Date: |
Sun, 30 Jun 2013 23:01:00 +0200 |
From: Andreas Färber <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
hw/cpu/a9mpcore.c | 24 +-----------------------
include/hw/cpu/a9mpcore.h | 37 +++++++++++++++++++++++++++++++++++++
2 files changed, 38 insertions(+), 23 deletions(-)
create mode 100644 include/hw/cpu/a9mpcore.h
diff --git a/hw/cpu/a9mpcore.c b/hw/cpu/a9mpcore.c
index 67ecf5d..d70eae6 100644
--- a/hw/cpu/a9mpcore.c
+++ b/hw/cpu/a9mpcore.c
@@ -8,29 +8,7 @@
* This code is licensed under the GPL.
*/
-#include "hw/sysbus.h"
-#include "hw/intc/gic_internal.h"
-#include "hw/misc/a9scu.h"
-#include "hw/timer/arm_mptimer.h"
-
-#define TYPE_A9MPCORE_PRIV "a9mpcore_priv"
-#define A9MPCORE_PRIV(obj) \
- OBJECT_CHECK(A9MPPrivState, (obj), TYPE_A9MPCORE_PRIV)
-
-typedef struct A9MPPrivState {
- /*< private >*/
- SysBusDevice parent_obj;
- /*< public >*/
-
- uint32_t num_cpu;
- MemoryRegion container;
- uint32_t num_irq;
-
- GICState gic;
- A9SCUState scu;
- ARMMPTimerState mptimer;
- ARMMPTimerState wdt;
-} A9MPPrivState;
+#include "hw/cpu/a9mpcore.h"
static void a9mp_priv_set_irq(void *opaque, int irq, int level)
{
diff --git a/include/hw/cpu/a9mpcore.h b/include/hw/cpu/a9mpcore.h
new file mode 100644
index 0000000..4a9ffc8
--- /dev/null
+++ b/include/hw/cpu/a9mpcore.h
@@ -0,0 +1,37 @@
+/*
+ * Cortex-A9MPCore internal peripheral emulation.
+ *
+ * Copyright (c) 2009 CodeSourcery.
+ * Copyright (c) 2011 Linaro Limited.
+ * Written by Paul Brook, Peter Maydell.
+ *
+ * This code is licensed under the GPL.
+ */
+#ifndef HW_CPU_A9MPCORE_H
+#define HW_CPU_A9MPCORE_H
+
+#include "hw/sysbus.h"
+#include "hw/intc/gic_internal.h"
+#include "hw/misc/a9scu.h"
+#include "hw/timer/arm_mptimer.h"
+
+#define TYPE_A9MPCORE_PRIV "a9mpcore_priv"
+#define A9MPCORE_PRIV(obj) \
+ OBJECT_CHECK(A9MPPrivState, (obj), TYPE_A9MPCORE_PRIV)
+
+typedef struct A9MPPrivState {
+ /*< private >*/
+ SysBusDevice parent_obj;
+ /*< public >*/
+
+ uint32_t num_cpu;
+ MemoryRegion container;
+ uint32_t num_irq;
+
+ GICState gic;
+ A9SCUState scu;
+ ARMMPTimerState mptimer;
+ ARMMPTimerState wdt;
+} A9MPPrivState;
+
+#endif
--
1.8.1.4
- [Qemu-devel] [PATCH RFC 00/15] arm: A9MPCore+A15MPCore QOM'ification, Andreas Färber, 2013/06/30
- [Qemu-devel] [PATCH RFC 02/15] cpu/a9mpcore: Split off instance_init, Andreas Färber, 2013/06/30
- [Qemu-devel] [PATCH RFC 03/15] cpu/a9mpcore: Embed GICState, Andreas Färber, 2013/06/30
- [Qemu-devel] [PATCH RFC 01/15] cpu/a9mpcore: QOM casting cleanup, Andreas Färber, 2013/06/30
- [Qemu-devel] [PATCH RFC 05/15] cpu/a9mpcore: Embed A9SCUState, Andreas Färber, 2013/06/30
- [Qemu-devel] [PATCH RFC 04/15] misc/a9scu: QOM cleanups, Andreas Färber, 2013/06/30
- [Qemu-devel] [PATCH RFC 07/15] timer/arm_mptimer: Convert to QOM realize, Andreas Färber, 2013/06/30
- [Qemu-devel] [PATCH RFC 06/15] timer/arm_mptimer: QOM cast cleanup, Andreas Färber, 2013/06/30
- [Qemu-devel] [PATCH RFC 10/15] cpu/a9mpcore: Prepare for QOM embedding,
Andreas Färber <=
- [Qemu-devel] [PATCH RFC 09/15] cpu/a9mpcore: Convert to QOM realize, Andreas Färber, 2013/06/30
- [Qemu-devel] [PATCH RFC 08/15] cpu/a9mpcore: Embed ARMMPTimerState, Andreas Färber, 2013/06/30
- [Qemu-devel] [PATCH RFC 11/15] cpu/a15mpcore: QOM cast cleanup, Andreas Färber, 2013/06/30
- [Qemu-devel] [PATCH RFC 12/15] cpu/a15mpcore: Split off instance_init, Andreas Färber, 2013/06/30
- [Qemu-devel] [PATCH RFC 13/15] cpu/a15mpcore: Embed GICState, Andreas Färber, 2013/06/30
- [Qemu-devel] [PATCH RFC 14/15] cpu/a15mpcore: Convert to QOM realize, Andreas Färber, 2013/06/30
- [Qemu-devel] [PATCH RFC 15/15] cpu/a15mpcore: Prepare for QOM embedding, Andreas Färber, 2013/06/30