[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH 1/7] ppc: introduce Core99MachinesState for the mac99
From: |
Mark Cave-Ayland |
Subject: |
[Qemu-ppc] [PATCH 1/7] ppc: introduce Core99MachinesState for the mac99 machine |
Date: |
Tue, 12 Jun 2018 17:43:56 +0100 |
This is in preparation for adding configuration controlled via machine
options.
Signed-off-by: Mark Cave-Ayland <address@hidden>
---
hw/ppc/mac.h | 11 +++++++++++
hw/ppc/mac_newworld.c | 7 +++++++
2 files changed, 18 insertions(+)
diff --git a/hw/ppc/mac.h b/hw/ppc/mac.h
index 89fa8bbed7..8046cd8a2f 100644
--- a/hw/ppc/mac.h
+++ b/hw/ppc/mac.h
@@ -27,6 +27,7 @@
#define PPC_MAC_H
#include "exec/memory.h"
+#include "hw/boards.h"
#include "hw/sysbus.h"
#include "hw/ide/internal.h"
#include "hw/input/adb.h"
@@ -65,6 +66,16 @@
#define NEWWORLD_IDE1_IRQ 0xe
#define NEWWORLD_IDE1_DMA_IRQ 0x3
+/* Core99 machine */
+#define TYPE_CORE99_MACHINE MACHINE_TYPE_NAME("mac99")
+#define CORE99_MACHINE(obj) OBJECT_CHECK(Core99MachineState, (obj), \
+ TYPE_CORE99_MACHINE)
+
+typedef struct Core99MachineState {
+ /*< private >*/
+ MachineState parent;
+} Core99MachineState;
+
/* MacIO */
#define TYPE_MACIO_IDE "macio-ide"
#define MACIO_IDE(obj) OBJECT_CHECK(MACIOIDEState, (obj), TYPE_MACIO_IDE)
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 744acdfd2e..5331aa002c 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -515,10 +515,17 @@ static void core99_machine_class_init(ObjectClass *oc,
void *data)
#endif
}
+static void core99_instance_init(Object *obj)
+{
+ return;
+}
+
static const TypeInfo core99_machine_info = {
.name = MACHINE_TYPE_NAME("mac99"),
.parent = TYPE_MACHINE,
.class_init = core99_machine_class_init,
+ .instance_init = core99_instance_init,
+ .instance_size = sizeof(Core99MachineState)
};
static void mac_machine_register_types(void)
--
2.11.0
- [Qemu-ppc] [PATCH 0/7] mac99: add via-pmu support, Mark Cave-Ayland, 2018/06/12
- [Qemu-ppc] [PATCH 5/7] adb: fix read reg 3 byte ordering, Mark Cave-Ayland, 2018/06/12
- [Qemu-ppc] [PATCH 1/7] ppc: introduce Core99MachinesState for the mac99 machine,
Mark Cave-Ayland <=
- [Qemu-ppc] [PATCH 4/7] mac_newworld: wire up programmer switch to NMI handler, Mark Cave-Ayland, 2018/06/12
- [Qemu-ppc] [PATCH 2/7] mac_newworld: add via machine option to control mac99 VIA/ADB configuration, Mark Cave-Ayland, 2018/06/12
- [Qemu-ppc] [PATCH 6/7] adb: add property to disable direct reg 3 writes, Mark Cave-Ayland, 2018/06/12
- [Qemu-ppc] [PATCH 3/7] mac_newworld: add gpios to macio devices with PMU enabled, Mark Cave-Ayland, 2018/06/12
- [Qemu-ppc] [PATCH 7/7] mac_newworld: add PMU device, Mark Cave-Ayland, 2018/06/12
- Re: [Qemu-ppc] [PATCH 0/7] mac99: add via-pmu support, David Gibson, 2018/06/12