Commit 06fe3a5b authored by Mark Cave-Ayland's avatar Mark Cave-Ayland Committed by David Gibson
Browse files

ppc: introduce Core99MachinesState for the mac99 machine 



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

Signed-off-by: default avatarMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 2c9dfdac

hw/ppc/mac.h

+11 −0
Original line number Diff line number Diff line
@@ -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)

hw/ppc/mac_newworld.c

+7 −0
Original line number Diff line number Diff line
@@ -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)