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/ppc/mac.h | |
parent | ecba28dbf2f832e82ef016b8e57c9da0a3023bfd (diff) |
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/ppc/mac.h')
-rw-r--r-- | hw/ppc/mac.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/ppc/mac.h b/hw/ppc/mac.h index 300fc8ab68..b3a26c49c1 100644 --- a/hw/ppc/mac.h +++ b/hw/ppc/mac.h @@ -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, |