[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PULL 04/14] macio: move MACIOIDEState type declarations to m
From: |
David Gibson |
Subject: |
[Qemu-ppc] [PULL 04/14] macio: move MACIOIDEState type declarations to macio.h |
Date: |
Fri, 7 Sep 2018 17:31:45 +1000 |
From: Mark Cave-Ayland <address@hidden>
Signed-off-by: Mark Cave-Ayland <address@hidden>
Signed-off-by: David Gibson <address@hidden>
---
hw/ide/macio.c | 1 +
hw/ppc/mac.h | 26 --------------------------
include/hw/misc/macio/macio.h | 26 ++++++++++++++++++++++++++
3 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/hw/ide/macio.c b/hw/ide/macio.c
index d3a85cba3b..f23961e241 100644
--- a/hw/ide/macio.c
+++ b/hw/ide/macio.c
@@ -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"
diff --git a/hw/ppc/mac.h b/hw/ppc/mac.h
index 41fd289e81..a741300ac9 100644
--- a/hw/ppc/mac.h
+++ b/hw/ppc/mac.h
@@ -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"
diff --git a/include/hw/misc/macio/macio.h b/include/hw/misc/macio/macio.h
index cfaa145500..0c3964ec12 100644
--- a/include/hw/misc/macio/macio.h
+++ b/include/hw/misc/macio/macio.h
@@ -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)
--
2.17.1
- [Qemu-ppc] [PULL 00/14] ppc-for-3.1 queue 20180907, David Gibson, 2018/09/07
- [Qemu-ppc] [PULL 02/14] spapr: fix leak of rev array, David Gibson, 2018/09/07
- [Qemu-ppc] [PULL 04/14] macio: move MACIOIDEState type declarations to macio.h,
David Gibson <=
- [Qemu-ppc] [PULL 14/14] target-ppc: Extend HWCAP2 bits for ISA 3.0, David Gibson, 2018/09/07
- [Qemu-ppc] [PULL 08/14] mac_oldworld: implement custom FWPathProvider, David Gibson, 2018/09/07
- [Qemu-ppc] [PULL 05/14] macio: add macio bus to help with fw path generation, David Gibson, 2018/09/07
- [Qemu-ppc] [PULL 09/14] uninorth: add ofw-addr property to allow correct fw path generation, David Gibson, 2018/09/07
- [Qemu-ppc] [PULL 06/14] macio: add addr property to macio IDE object, David Gibson, 2018/09/07
- [Qemu-ppc] [PULL 10/14] mac_newworld: implement custom FWPathProvider, David Gibson, 2018/09/07
- [Qemu-ppc] [PULL 01/14] ppc: Remove deprecated ppcemb target, David Gibson, 2018/09/07