diff options
| author | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2017-09-24 15:47:43 +0100 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2017-09-27 13:05:41 +1000 |
| commit | 0fc84331d631ea434fb846f4916f216aeb5b5f91 (patch) | |
| tree | e8eac21c01add4e246445f2f4f03b23454b0c71a /hw/ide | |
| parent | ecba28dbf2f832e82ef016b8e57c9da0a3023bfd (diff) | |
| download | qemu-0fc84331d631ea434fb846f4916f216aeb5b5f91.tar.gz | |
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: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'hw/ide')
| -rw-r--r-- | hw/ide/macio.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/hw/ide/macio.c b/hw/ide/macio.c index 18ae952934..19d5f5a8b3 100644 --- a/hw/ide/macio.c +++ b/hw/ide/macio.c @@ -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); } |