Re: [PATCH 06/10] hw/ppc/mac.h: Move newworld specific atuff out from shared header

[Mark Cave-Ayland]

On 17/09/2022 00:07, BALATON Zoltan wrote:

Move the parts specific to and only used by mac99 out from the shared
mac.h into mac_newworld.c where they better belong.

Signed-off-by: BALATON Zoltan <bala...@eik.bme.hu>
---
  hw/ppc/mac.h          | 24 ------------------------
  hw/ppc/mac_newworld.c | 19 +++++++++++++++++++
  hw/ppc/mac_oldworld.c |  1 +
  3 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/hw/ppc/mac.h b/hw/ppc/mac.h
index a1fa8f8e41..e97087c7e7 100644
--- a/hw/ppc/mac.h
+++ b/hw/ppc/mac.h
@@ -26,15 +26,8 @@
  #ifndef PPC_MAC_H
  #define PPC_MAC_H

-#include "qemu/units.h"

  #include "exec/memory.h"
-#include "hw/boards.h"
  #include "hw/sysbus.h"
-#include "hw/input/adb.h"
-#include "hw/misc/mos6522.h"
-#include "hw/pci/pci_host.h"
-#include "hw/pci-host/uninorth.h"
-#include "qom/object.h"

#define NVRAM_SIZE 0x2000

  #define PROM_FILENAME    "openbios-ppc"
@@ -65,23 +58,6 @@
  #define NEWWORLD_EXTING_GPIO1  0x2f
  #define NEWWORLD_EXTING_GPIO9  0x37

-/* Core99 machine */

-#define TYPE_CORE99_MACHINE MACHINE_TYPE_NAME("mac99")
-typedef struct Core99MachineState Core99MachineState;
-DECLARE_INSTANCE_CHECKER(Core99MachineState, CORE99_MACHINE,
-                         TYPE_CORE99_MACHINE)
-
-#define CORE99_VIA_CONFIG_CUDA     0x0
-#define CORE99_VIA_CONFIG_PMU      0x1
-#define CORE99_VIA_CONFIG_PMU_ADB  0x2
-
-struct Core99MachineState {
-    /*< private >*/
-    MachineState parent;
-
-    uint8_t via_config;
-};
-
  /* Grackle PCI */
  #define TYPE_GRACKLE_PCI_HOST_BRIDGE "grackle-pcihost"

diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c

index ae90e5c353..14cc8cd6ea 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -48,10 +48,13 @@

#include "qemu/osdep.h"

  #include "qemu/datadir.h"
+#include "qemu/units.h"
  #include "qapi/error.h"
  #include "hw/ppc/ppc.h"
  #include "hw/qdev-properties.h"
  #include "hw/ppc/mac.h"
+#include "hw/boards.h"
+#include "hw/pci-host/uninorth.h"
  #include "hw/input/adb.h"
  #include "hw/ppc/mac_dbdma.h"
  #include "hw/pci/pci.h"
@@ -83,6 +86,22 @@
  #define PROM_BASE 0xfff00000
  #define PROM_SIZE (1 * MiB)

+#define TYPE_CORE99_MACHINE MACHINE_TYPE_NAME("mac99")

+typedef struct Core99MachineState Core99MachineState;
+DECLARE_INSTANCE_CHECKER(Core99MachineState, CORE99_MACHINE,
+                         TYPE_CORE99_MACHINE)
+
+#define CORE99_VIA_CONFIG_CUDA     0x0
+#define CORE99_VIA_CONFIG_PMU      0x1
+#define CORE99_VIA_CONFIG_PMU_ADB  0x2
+
+struct Core99MachineState {
+    /*< private >*/
+    MachineState parent;
+
+    uint8_t via_config;
+};
+
  static void fw_cfg_boot_set(void *opaque, const char *boot_device,
                              Error **errp)
  {
diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index a497507f1d..f323a49d7a 100644
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -31,6 +31,7 @@
  #include "hw/ppc/ppc.h"
  #include "hw/qdev-properties.h"
  #include "mac.h"
+#include "hw/boards.h"
  #include "hw/input/adb.h"
  #include "sysemu/sysemu.h"
  #include "net/net.h"

Reviewed-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>


ATB,

Mark.