ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ppc: introduce Core99MachinesState for the mac99 machine 

This is in preparation for adding configuration controlled via machine
options.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Mark Cave-Ayland 2018-06-12 17:43:56 +01:00 committed by David Gibson
parent 2c9dfdacc5
commit 06fe3a5bf1
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/ppc/mac.h
View File

@ -27,6 +27,7 @@
#define PPC_MAC_H #define PPC_MAC_H
#include "exec/memory.h" #include "exec/memory.h"
#include "hw/boards.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "hw/ide/internal.h" #include "hw/ide/internal.h"
#include "hw/input/adb.h" #include "hw/input/adb.h"
@ -65,6 +66,16 @@
#define NEWWORLD_IDE1_IRQ 0xe #define NEWWORLD_IDE1_IRQ 0xe
#define NEWWORLD_IDE1_DMA_IRQ 0x3 #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 */ /* MacIO */
#define TYPE_MACIO_IDE "macio-ide" #define TYPE_MACIO_IDE "macio-ide"
#define MACIO_IDE(obj) OBJECT_CHECK(MACIOIDEState, (obj), TYPE_MACIO_IDE) #define MACIO_IDE(obj) OBJECT_CHECK(MACIOIDEState, (obj), TYPE_MACIO_IDE)

7
hw/ppc/mac_newworld.c
View File

@ -515,10 +515,17 @@ static void core99_machine_class_init(ObjectClass *oc, void *data)
#endif #endif
} }
static void core99_instance_init(Object *obj)
{
return;
}
static const TypeInfo core99_machine_info = { static const TypeInfo core99_machine_info = {
.name = MACHINE_TYPE_NAME("mac99"), .name = MACHINE_TYPE_NAME("mac99"),
.parent = TYPE_MACHINE, .parent = TYPE_MACHINE,
.class_init = core99_machine_class_init, .class_init = core99_machine_class_init,
.instance_init = core99_instance_init,
.instance_size = sizeof(Core99MachineState)
}; };
static void mac_machine_register_types(void) static void mac_machine_register_types(void)