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

macio: pass channel into MACIOIDEState via qdev property 



One of the reasons macio_ide_register_dma() needs to exist is because the
channel id isn't passed into the MACIO_IDE object. Pass in the channel id
using a qdev property to remove this requirement.

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 ecba28db

hw/ide/macio.c

+8 −2
Original line number Diff line number Diff line
@@ -452,12 +452,18 @@ static void macio_ide_initfn(Object *obj) 
    s->ide_irq = qemu_allocate_irq(pmac_ide_irq, s, 1);

}



static Property macio_ide_properties[] = {

    DEFINE_PROP_UINT32("channel", MACIOIDEState, channel, 0),

    DEFINE_PROP_END_OF_LIST(),

};



static void macio_ide_class_init(ObjectClass *oc, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(oc);



    dc->realize = macio_ide_realizefn;

    dc->reset = macio_ide_reset;

    dc->props = macio_ide_properties;

    dc->vmsd = &vmstate_pmac;

    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);

}
@@ -487,10 +493,10 @@ void macio_ide_init_drives(MACIOIDEState *s, DriveInfo **hd_table) 
    }

}



void macio_ide_register_dma(MACIOIDEState *s, void *dbdma, int channel)

void macio_ide_register_dma(MACIOIDEState *s, void *dbdma)

{

    s->dbdma = dbdma;

    DBDMA_register_channel(dbdma, channel, s->dma_irq,

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

                           pmac_ide_transfer, pmac_ide_flush, s);

}

hw/misc/macio/macio.c

+3 −1
Original line number Diff line number Diff line
@@ -159,7 +159,9 @@ static void macio_realize_ide(MacIOState *s, MACIOIDEState *ide, 
    sysbus_dev = SYS_BUS_DEVICE(ide);

    sysbus_connect_irq(sysbus_dev, 0, irq0);

    sysbus_connect_irq(sysbus_dev, 1, irq1);

    macio_ide_register_dma(ide, s->dbdma, dmaid);

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

    macio_ide_register_dma(ide, s->dbdma);



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

}

hw/ppc/mac.h

+2 −2
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ typedef struct MACIOIDEState { 
    /*< private >*/

    SysBusDevice parent_obj;

    /*< public >*/



    uint32_t channel;

    qemu_irq real_ide_irq;

    qemu_irq real_dma_irq;

    qemu_irq ide_irq;
@@ -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, int channel);

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



void macio_init(PCIDevice *dev,

                MemoryRegion *pic_mem,