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

macio: remove macio_init() function 



Move the remaining comment into macio.c for reference, then remove the
macio_init() function and instantiate the macio devices for both Old World
and New World machines via qdev_init_nofail() directly.

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 aa79b086

hw/misc/macio/macio.c

+3 −8
Original line number Diff line number Diff line
@@ -33,6 +33,9 @@ 
#include "hw/misc/macio/macio.h"

#include "hw/intc/heathrow_pic.h"



/* Note: this code is strongly inspirated from the corresponding code

 * in PearPC */



/*

 * The mac-io has two interfaces to the ESCC. One is called "escc-legacy",

 * while the other one is the normal, current ESCC interface.
@@ -442,11 +445,3 @@ static void macio_register_types(void) 
}



type_init(macio_register_types)
 


void macio_init(PCIDevice *d,

                MemoryRegion *pic_mem)

{

    /* Note: this code is strongly inspirated from the corresponding code

       in PearPC */

    qdev_init_nofail(DEVICE(d));

}

hw/ppc/mac_newworld.c

+1 −3
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ static void ppc_core99_init(MachineState *machine) 
    MacIONVRAMState *nvr;

    int bios_size, ndrv_size;

    uint8_t *ndrv_file;

    MemoryRegion *pic_mem;

    int ppc_boot_device;

    DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];

    void *fw_cfg;
@@ -337,7 +336,6 @@ static void ppc_core99_init(MachineState *machine) 
    qdev_prop_set_uint32(pic_dev, "model", OPENPIC_MODEL_KEYLARGO);

    qdev_init_nofail(pic_dev);

    s = SYS_BUS_DEVICE(pic_dev);

    pic_mem = s->mmio[0].memory;

    k = 0;

    for (i = 0; i < smp_cpus; i++) {

        for (j = 0; j < OPENPIC_OUTPUT_NB; j++) {
@@ -381,7 +379,7 @@ static void ppc_core99_init(MachineState *machine) 
    qdev_prop_set_uint64(dev, "frequency", tbfreq);

    object_property_set_link(OBJECT(macio), OBJECT(pic_dev), "pic",

                             &error_abort);

    macio_init(PCI_DEVICE(macio), pic_mem);

    qdev_init_nofail(dev);



    /* We only emulate 2 out of 3 IDE controllers for now */

    ide_drive_get(hd, ARRAY_SIZE(hd));

hw/ppc/mac_oldworld.c

+1 −3
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ static void ppc_heathrow_init(MachineState *machine) 
    OldWorldMacIOState *macio;

    MACIOIDEState *macio_ide;

    DeviceState *dev, *pic_dev;

    SysBusDevice *sbd;

    BusState *adb_bus;

    int bios_size, ndrv_size;

    uint8_t *ndrv_file;
@@ -283,8 +282,7 @@ static void ppc_heathrow_init(MachineState *machine) 
    qdev_prop_set_uint64(dev, "frequency", tbfreq);

    object_property_set_link(OBJECT(macio), OBJECT(pic_dev), "pic",

                             &error_abort);

    sbd = SYS_BUS_DEVICE(pic_dev);

    macio_init(PCI_DEVICE(macio), sysbus_mmio_get_region(sbd, 0));

    qdev_init_nofail(dev);



    macio_ide = MACIO_IDE(object_resolve_path_component(OBJECT(macio),

                                                        "ide[0]"));