[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 43/58] arm11mpcore: Prepare for QOM embedding
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 43/58] arm11mpcore: Prepare for QOM embedding |
Date: |
Tue, 8 Oct 2013 19:44:41 +0200 |
Move state struct, type constant and cast macro to a new header.
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
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 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)
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
--
1.8.1.4
- [Qemu-devel] [PULL 34/58] a9scu: Build only once, (continued)
- [Qemu-devel] [PULL 34/58] a9scu: Build only once, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 35/58] arm11mpcore: Fix typo in MemoryRegion name, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 26/58] arm_mptimer: Convert to QOM realize, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 10/58] exynos4_boards: Silence lack of -smp 2 warning for qtest, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 09/58] omap_sx1: Don't enforce use of kernel or flash for qtest, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 36/58] arm11mpcore: Drop unused fields, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 42/58] arm11mpcore: Convert mpcore_rirq_state to QOM realize, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 33/58] a15mpcore: Prepare for QOM embedding, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 44/58] arm11mpcore: Split off RealView MPCore, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 25/58] a9mpcore: Embed A9SCUState, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 43/58] arm11mpcore: Prepare for QOM embedding,
Andreas Färber <=
- [Qemu-devel] [PULL 57/58] ide: Drop ide_init2_with_non_qdev_drives(), Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 27/58] a9mpcore: Embed ARMMPTimerState, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 18/58] leon3: Don't enforce use of -bios with qtest, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 49/58] qdev-monitor: Avoid qdev as variable name, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 56/58] microdrive: Coding Style cleanups, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 37/58] arm11mpcore: Create container MemoryRegion in instance_init, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 58/58] pcmcia/pxa2xx: QOM'ify PXA2xxPCMCIAState, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 19/58] qtest: Prepare QOM machine tests, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 50/58] qdev-monitor: Inline qdev_init() for device_add, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 48/58] qdev: Drop misleading qdev_free() function, Andreas Färber, 2013/10/08