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

macio: use object link between MACIO_IDE and MAC_DBDMA object 



Using a standard QOM object link we can pass a reference to the MAC_DBDMA
controller to the MACIO_IDE object which removes the last external parameter
to macio_ide_register_dma().

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 0fc84331

hw/ide/macio.c

+6 −3
Original line number Diff line number Diff line
@@ -450,6 +450,10 @@ static void macio_ide_initfn(Object *obj) 
    sysbus_init_irq(d, &s->real_dma_irq);

    s->dma_irq = qemu_allocate_irq(pmac_ide_irq, s, 0);

    s->ide_irq = qemu_allocate_irq(pmac_ide_irq, s, 1);



    object_property_add_link(obj, "dbdma", TYPE_MAC_DBDMA,

                             (Object **) &s->dbdma,

                             qdev_prop_allow_set_link_before_realize, 0, NULL);

}



static Property macio_ide_properties[] = {
@@ -493,10 +497,9 @@ void macio_ide_init_drives(MACIOIDEState *s, DriveInfo **hd_table) 
    }

}



void macio_ide_register_dma(MACIOIDEState *s, void *dbdma)

void macio_ide_register_dma(MACIOIDEState *s)

{

    s->dbdma = dbdma;

    DBDMA_register_channel(dbdma, s->channel, s->dma_irq,

    DBDMA_register_channel(s->dbdma, s->channel, s->dma_irq,

                           pmac_ide_transfer, pmac_ide_flush, s);

}

hw/misc/macio/macio.c

+2 −1
Original line number Diff line number Diff line
@@ -160,7 +160,8 @@ static void macio_realize_ide(MacIOState *s, MACIOIDEState *ide, 
    sysbus_connect_irq(sysbus_dev, 0, irq0);

    sysbus_connect_irq(sysbus_dev, 1, irq1);

    qdev_prop_set_uint32(DEVICE(ide), "channel", dmaid);

    macio_ide_register_dma(ide, s->dbdma);

    object_property_set_link(OBJECT(ide), OBJECT(s->dbdma), "dbdma", errp);

    macio_ide_register_dma(ide);



    object_property_set_bool(OBJECT(ide), true, "realized", errp);

}

hw/ppc/mac.h

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ typedef struct MACIOIDEState { 
} MACIOIDEState;



void macio_ide_init_drives(MACIOIDEState *ide, DriveInfo **hd_table);

void macio_ide_register_dma(MACIOIDEState *ide, void *dbdma);

void macio_ide_register_dma(MACIOIDEState *ide);



void macio_init(PCIDevice *dev,

                MemoryRegion *pic_mem,