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

macio: move MACIOIDEState type declarations to macio.h 



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 bc9b1f10

hw/ide/macio.c

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "hw/hw.h"

#include "hw/ppc/mac.h"

#include "hw/ppc/mac_dbdma.h"

#include "hw/misc/macio/macio.h"

#include "sysemu/block-backend.h"

#include "sysemu/dma.h"

hw/ppc/mac.h

+0 −26
Original line number Diff line number Diff line
@@ -86,32 +86,6 @@ typedef struct Core99MachineState { 
    uint8_t via_config;

} Core99MachineState;



/* MacIO */

#define TYPE_MACIO_IDE "macio-ide"

#define MACIO_IDE(obj) OBJECT_CHECK(MACIOIDEState, (obj), TYPE_MACIO_IDE)



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;

    qemu_irq dma_irq;



    MemoryRegion mem;

    IDEBus bus;

    IDEDMA dma;

    void *dbdma;

    bool dma_active;

    uint32_t timing_reg;

    uint32_t irq_reg;

} MACIOIDEState;



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

void macio_ide_register_dma(MACIOIDEState *ide);



/* Grackle PCI */

#define TYPE_GRACKLE_PCI_HOST_BRIDGE "grackle-pcihost"

include/hw/misc/macio/macio.h

+26 −0
Original line number Diff line number Diff line
@@ -34,6 +34,32 @@ 
#include "hw/ppc/mac_dbdma.h"

#include "hw/ppc/openpic.h"



/* MacIO IDE */

#define TYPE_MACIO_IDE "macio-ide"

#define MACIO_IDE(obj) OBJECT_CHECK(MACIOIDEState, (obj), TYPE_MACIO_IDE)



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;

    qemu_irq dma_irq;



    MemoryRegion mem;

    IDEBus bus;

    IDEDMA dma;

    void *dbdma;

    bool dma_active;

    uint32_t timing_reg;

    uint32_t irq_reg;

} MACIOIDEState;



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

void macio_ide_register_dma(MACIOIDEState *ide);



#define TYPE_MACIO "macio"

#define MACIO(obj) OBJECT_CHECK(MacIOState, (obj), TYPE_MACIO)