diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-01-23 23:03:57 +0000 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2013-01-25 22:02:54 +0100 |
| commit | d037834a9d3847499e8a146bd1893a5c856411be (patch) | |
| tree | 976fdc56cb0ba9f6e66d14cd77b5596ce7b81ab4 /hw/ppc/mac.h | |
| parent | 7b925079e36cf26ca2e1f8db84b771ddc3d6340c (diff) | |
| download | qemu-d037834a9d3847499e8a146bd1893a5c856411be.tar.gz qemu-d037834a9d3847499e8a146bd1893a5c856411be.tar.bz2 qemu-d037834a9d3847499e8a146bd1893a5c856411be.zip | |
macio: Split MacIO in two
Let the machines create two different types. This prepares to move
knowledge about sub-devices from the machines into the devices.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'hw/ppc/mac.h')
| -rw-r--r-- | hw/ppc/mac.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/hw/ppc/mac.h b/hw/ppc/mac.h index 89c7d66386..864a610860 100644 --- a/hw/ppc/mac.h +++ b/hw/ppc/mac.h @@ -45,10 +45,12 @@ void cuda_init (MemoryRegion **cuda_mem, qemu_irq irq); /* MacIO */ -void macio_init (PCIBus *bus, int device_id, int is_oldworld, - MemoryRegion *pic_mem, MemoryRegion *dbdma_mem, - MemoryRegion *cuda_mem, void *nvram, - int nb_ide, MemoryRegion **ide_mem, MemoryRegion *escc_mem); +#define TYPE_OLDWORLD_MACIO "macio-oldworld" +#define TYPE_NEWWORLD_MACIO "macio-newworld" +void macio_init(PCIDevice *dev, + MemoryRegion *pic_mem, MemoryRegion *dbdma_mem, + MemoryRegion *cuda_mem, void *nvram, + int nb_ide, MemoryRegion **ide_mem, MemoryRegion *escc_mem); /* Heathrow PIC */ qemu_irq *heathrow_pic_init(MemoryRegion **pmem, |