[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 09/13] hw/ppc/mac.h: Move macio specific parts out from shared
From: |
BALATON Zoltan |
Subject: |
[PATCH v2 09/13] hw/ppc/mac.h: Move macio specific parts out from shared header |
Date: |
Sun, 25 Sep 2022 14:38:16 +0200 (CEST) |
Move the parts specific to and only used by macio out from the shared
mac.h into macio.c where they better belong.
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/misc/macio/macio.c | 5 +++--
hw/ppc/mac.h | 23 -----------------------
include/hw/misc/macio/macio.h | 21 +++++++++++++++++++++
3 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c
index c1fad43f6c..f9f0758b03 100644
--- a/hw/misc/macio/macio.c
+++ b/hw/misc/macio/macio.c
@@ -37,8 +37,9 @@
#include "hw/intc/heathrow_pic.h"
#include "trace.h"
-/* Note: this code is strongly inspirated from the corresponding code
- * in PearPC */
+#define ESCC_CLOCK 3686400
+
+/* Note: this code is strongly inspired by the corresponding code in PearPC */
/*
* The mac-io has two interfaces to the ESCC. One is called "escc-legacy",
diff --git a/hw/ppc/mac.h b/hw/ppc/mac.h
index e97087c7e7..55cb02c990 100644
--- a/hw/ppc/mac.h
+++ b/hw/ppc/mac.h
@@ -35,29 +35,6 @@
#define KERNEL_LOAD_ADDR 0x01000000
#define KERNEL_GAP 0x00100000
-#define ESCC_CLOCK 3686400
-
-/* Old World IRQs */
-#define OLDWORLD_CUDA_IRQ 0x12
-#define OLDWORLD_ESCCB_IRQ 0x10
-#define OLDWORLD_ESCCA_IRQ 0xf
-#define OLDWORLD_IDE0_IRQ 0xd
-#define OLDWORLD_IDE0_DMA_IRQ 0x2
-#define OLDWORLD_IDE1_IRQ 0xe
-#define OLDWORLD_IDE1_DMA_IRQ 0x3
-
-/* New World IRQs */
-#define NEWWORLD_CUDA_IRQ 0x19
-#define NEWWORLD_PMU_IRQ 0x19
-#define NEWWORLD_ESCCB_IRQ 0x24
-#define NEWWORLD_ESCCA_IRQ 0x25
-#define NEWWORLD_IDE0_IRQ 0xd
-#define NEWWORLD_IDE0_DMA_IRQ 0x2
-#define NEWWORLD_IDE1_IRQ 0xe
-#define NEWWORLD_IDE1_DMA_IRQ 0x3
-#define NEWWORLD_EXTING_GPIO1 0x2f
-#define NEWWORLD_EXTING_GPIO9 0x37
-
/* 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 6c05f3bfd2..26cf15b1ce 100644
--- a/include/hw/misc/macio/macio.h
+++ b/include/hw/misc/macio/macio.h
@@ -38,6 +38,27 @@
#include "hw/ppc/openpic.h"
#include "qom/object.h"
+/* Old World IRQs */
+#define OLDWORLD_CUDA_IRQ 0x12
+#define OLDWORLD_ESCCB_IRQ 0x10
+#define OLDWORLD_ESCCA_IRQ 0xf
+#define OLDWORLD_IDE0_IRQ 0xd
+#define OLDWORLD_IDE0_DMA_IRQ 0x2
+#define OLDWORLD_IDE1_IRQ 0xe
+#define OLDWORLD_IDE1_DMA_IRQ 0x3
+
+/* New World IRQs */
+#define NEWWORLD_CUDA_IRQ 0x19
+#define NEWWORLD_PMU_IRQ 0x19
+#define NEWWORLD_ESCCB_IRQ 0x24
+#define NEWWORLD_ESCCA_IRQ 0x25
+#define NEWWORLD_IDE0_IRQ 0xd
+#define NEWWORLD_IDE0_DMA_IRQ 0x2
+#define NEWWORLD_IDE1_IRQ 0xe
+#define NEWWORLD_IDE1_DMA_IRQ 0x3
+#define NEWWORLD_EXTING_GPIO1 0x2f
+#define NEWWORLD_EXTING_GPIO9 0x37
+
/* MacIO virtual bus */
#define TYPE_MACIO_BUS "macio-bus"
OBJECT_DECLARE_SIMPLE_TYPE(MacIOBusState, MACIO_BUS)
--
2.30.4
- [PATCH v2 01/13] mac_newworld: Drop some variables, (continued)
- [PATCH v2 01/13] mac_newworld: Drop some variables, BALATON Zoltan, 2022/09/25
- [PATCH v2 04/13] mac_{old|new}world: Avoid else branch by setting default value, BALATON Zoltan, 2022/09/25
- [PATCH v2 02/13] mac_oldworld: Drop some more variables, BALATON Zoltan, 2022/09/25
- [PATCH v2 03/13] mac_{old|new}world: Set tbfreq at declaration, BALATON Zoltan, 2022/09/25
- [PATCH v2 06/13] mac_newworld: Simplify creation of Uninorth devices, BALATON Zoltan, 2022/09/25
- [PATCH v2 11/13] hw/ppc/mac.h: Move PROM and KERNEL defines to board code, BALATON Zoltan, 2022/09/25
- [PATCH v2 12/13] hw/ppc/mac.h: Rename to include/hw/nvram/mac_nvram.h, BALATON Zoltan, 2022/09/25
- [PATCH v2 07/13] mac_{old|new}world: Reduce number of QOM casts, BALATON Zoltan, 2022/09/25
- [PATCH v2 09/13] hw/ppc/mac.h: Move macio specific parts out from shared header,
BALATON Zoltan <=
- [PATCH v2 05/13] mac_oldworld: Do not open code sysbus_mmio_map(), BALATON Zoltan, 2022/09/25
- [PATCH v2 08/13] hw/ppc/mac.h: Move newworld specific parts out from shared header, BALATON Zoltan, 2022/09/25
- [PATCH v2 10/13] hw/ppc/mac.h: Move grackle-pcihost declaration out from shared header, BALATON Zoltan, 2022/09/25
- [PATCH v2 13/13] mac_nvram: Use NVRAM_SIZE constant, BALATON Zoltan, 2022/09/25