diff mbox series

[10/10] hw/ppc/mac.h: Rename to include/hw/nvram/mac_nvram.h

Message ID 03ca6bfb81e45d8aada8495fb17afd55da9756b5.1663368422.git.balaton@eik.bme.hu
State Changes Requested
Headers show
Series Misc ppc/mac machines clean up | expand

Commit Message

BALATON Zoltan Sept. 16, 2022, 11:07 p.m. UTC
All that is left in mac.h now belongs to the nvram emulation so rename
it accordingly and only include it where it is really used.

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
---
 MAINTAINERS                                  |  1 +
 hw/ide/macio.c                               |  1 -
 hw/intc/heathrow_pic.c                       |  1 -
 hw/intc/openpic.c                            |  1 -
 hw/misc/macio/cuda.c                         |  1 -
 hw/misc/macio/gpio.c                         |  1 -
 hw/misc/macio/macio.c                        |  1 -
 hw/misc/macio/pmu.c                          |  1 -
 hw/nvram/mac_nvram.c                         |  2 +-
 hw/pci-host/grackle.c                        |  1 -
 hw/pci-host/uninorth.c                       |  1 -
 hw/ppc/mac_newworld.c                        |  2 +-
 hw/ppc/mac_oldworld.c                        |  1 -
 include/hw/misc/macio/macio.h                |  2 +-
 hw/ppc/mac.h => include/hw/nvram/mac_nvram.h | 12 ++++++------
 15 files changed, 10 insertions(+), 19 deletions(-)
 rename hw/ppc/mac.h => include/hw/nvram/mac_nvram.h (88%)

Comments

Mark Cave-Ayland Sept. 25, 2022, 9:23 a.m. UTC | #1
On 17/09/2022 00:07, BALATON Zoltan wrote:

> All that is left in mac.h now belongs to the nvram emulation so rename
> it accordingly and only include it where it is really used.
> 
> Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
> ---
>   MAINTAINERS                                  |  1 +
>   hw/ide/macio.c                               |  1 -
>   hw/intc/heathrow_pic.c                       |  1 -
>   hw/intc/openpic.c                            |  1 -
>   hw/misc/macio/cuda.c                         |  1 -
>   hw/misc/macio/gpio.c                         |  1 -
>   hw/misc/macio/macio.c                        |  1 -
>   hw/misc/macio/pmu.c                          |  1 -
>   hw/nvram/mac_nvram.c                         |  2 +-
>   hw/pci-host/grackle.c                        |  1 -
>   hw/pci-host/uninorth.c                       |  1 -
>   hw/ppc/mac_newworld.c                        |  2 +-
>   hw/ppc/mac_oldworld.c                        |  1 -
>   include/hw/misc/macio/macio.h                |  2 +-
>   hw/ppc/mac.h => include/hw/nvram/mac_nvram.h | 12 ++++++------
>   15 files changed, 10 insertions(+), 19 deletions(-)
>   rename hw/ppc/mac.h => include/hw/nvram/mac_nvram.h (88%)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 1729c0901c..6d34e81246 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1328,6 +1328,7 @@ F: hw/nvram/mac_nvram.c
>   F: hw/input/adb*
>   F: include/hw/misc/macio/
>   F: include/hw/misc/mos6522.h
> +F: include/hw/nvram/mac_nvram.h
>   F: include/hw/ppc/mac_dbdma.h
>   F: include/hw/pci-host/uninorth.h
>   F: include/hw/input/adb*
> diff --git a/hw/ide/macio.c b/hw/ide/macio.c
> index 1c15c37ec5..e604466acb 100644
> --- a/hw/ide/macio.c
> +++ b/hw/ide/macio.c
> @@ -24,7 +24,6 @@
>    */
>   
>   #include "qemu/osdep.h"
> -#include "hw/ppc/mac.h"
>   #include "hw/ppc/mac_dbdma.h"
>   #include "hw/qdev-properties.h"
>   #include "migration/vmstate.h"
> diff --git a/hw/intc/heathrow_pic.c b/hw/intc/heathrow_pic.c
> index cb97c315da..13048a2735 100644
> --- a/hw/intc/heathrow_pic.c
> +++ b/hw/intc/heathrow_pic.c
> @@ -24,7 +24,6 @@
>    */
>   
>   #include "qemu/osdep.h"
> -#include "hw/ppc/mac.h"
>   #include "migration/vmstate.h"
>   #include "qemu/module.h"
>   #include "hw/intc/heathrow_pic.h"
> diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c
> index b0787e8ee7..c757adbe53 100644
> --- a/hw/intc/openpic.c
> +++ b/hw/intc/openpic.c
> @@ -32,7 +32,6 @@
>   
>   #include "qemu/osdep.h"
>   #include "hw/irq.h"
> -#include "hw/ppc/mac.h"
>   #include "hw/pci/pci.h"
>   #include "hw/ppc/openpic.h"
>   #include "hw/ppc/ppc_e500.h"
> diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c
> index 1498113cfc..0d4c13319a 100644
> --- a/hw/misc/macio/cuda.c
> +++ b/hw/misc/macio/cuda.c
> @@ -25,7 +25,6 @@
>   
>   #include "qemu/osdep.h"
>   #include "hw/irq.h"
> -#include "hw/ppc/mac.h"
>   #include "hw/qdev-properties.h"
>   #include "migration/vmstate.h"
>   #include "hw/input/adb.h"
> diff --git a/hw/misc/macio/gpio.c b/hw/misc/macio/gpio.c
> index b1bcf830c3..c8ac5633b2 100644
> --- a/hw/misc/macio/gpio.c
> +++ b/hw/misc/macio/gpio.c
> @@ -24,7 +24,6 @@
>    */
>   
>   #include "qemu/osdep.h"
> -#include "hw/ppc/mac.h"
>   #include "hw/qdev-properties.h"
>   #include "migration/vmstate.h"
>   #include "hw/misc/macio/macio.h"
> diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c
> index eca5983a4d..782207647c 100644
> --- a/hw/misc/macio/macio.c
> +++ b/hw/misc/macio/macio.c
> @@ -26,7 +26,6 @@
>   #include "qemu/osdep.h"
>   #include "qapi/error.h"
>   #include "qemu/module.h"
> -#include "hw/ppc/mac.h"
>   #include "hw/misc/macio/cuda.h"
>   #include "hw/pci/pci.h"
>   #include "hw/ppc/mac_dbdma.h"
> diff --git a/hw/misc/macio/pmu.c b/hw/misc/macio/pmu.c
> index 336502a84b..70562ed8d0 100644
> --- a/hw/misc/macio/pmu.c
> +++ b/hw/misc/macio/pmu.c
> @@ -29,7 +29,6 @@
>    */
>   
>   #include "qemu/osdep.h"
> -#include "hw/ppc/mac.h"
>   #include "hw/qdev-properties.h"
>   #include "migration/vmstate.h"
>   #include "hw/input/adb.h"
> diff --git a/hw/nvram/mac_nvram.c b/hw/nvram/mac_nvram.c
> index 11f2d31cdb..3d9ddda217 100644
> --- a/hw/nvram/mac_nvram.c
> +++ b/hw/nvram/mac_nvram.c
> @@ -25,7 +25,7 @@
>   
>   #include "qemu/osdep.h"
>   #include "hw/nvram/chrp_nvram.h"
> -#include "hw/ppc/mac.h"
> +#include "hw/nvram/mac_nvram.h"
>   #include "hw/qdev-properties.h"
>   #include "migration/vmstate.h"
>   #include "qemu/cutils.h"
> diff --git a/hw/pci-host/grackle.c b/hw/pci-host/grackle.c
> index 5282123004..d9c11d22e0 100644
> --- a/hw/pci-host/grackle.c
> +++ b/hw/pci-host/grackle.c
> @@ -25,7 +25,6 @@
>   
>   #include "qemu/osdep.h"
>   #include "hw/pci/pci_host.h"
> -#include "hw/ppc/mac.h"
>   #include "hw/qdev-properties.h"
>   #include "hw/pci/pci.h"
>   #include "hw/irq.h"
> diff --git a/hw/pci-host/uninorth.c b/hw/pci-host/uninorth.c
> index d25b62d6a5..aebd44d265 100644
> --- a/hw/pci-host/uninorth.c
> +++ b/hw/pci-host/uninorth.c
> @@ -24,7 +24,6 @@
>   
>   #include "qemu/osdep.h"
>   #include "hw/irq.h"
> -#include "hw/ppc/mac.h"
>   #include "hw/qdev-properties.h"
>   #include "qemu/module.h"
>   #include "hw/pci/pci.h"
> diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
> index 1cb10726d3..9cec30bbd3 100644
> --- a/hw/ppc/mac_newworld.c
> +++ b/hw/ppc/mac_newworld.c
> @@ -52,7 +52,7 @@
>   #include "qapi/error.h"
>   #include "hw/ppc/ppc.h"
>   #include "hw/qdev-properties.h"
> -#include "hw/ppc/mac.h"
> +#include "hw/nvram/mac_nvram.h"
>   #include "hw/boards.h"
>   #include "hw/pci-host/uninorth.h"
>   #include "hw/input/adb.h"
> diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
> index e196090f49..27d7c19f00 100644
> --- a/hw/ppc/mac_oldworld.c
> +++ b/hw/ppc/mac_oldworld.c
> @@ -30,7 +30,6 @@
>   #include "qapi/error.h"
>   #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"
> diff --git a/include/hw/misc/macio/macio.h b/include/hw/misc/macio/macio.h
> index 6c05f3bfd2..aebe990270 100644
> --- a/include/hw/misc/macio/macio.h
> +++ b/include/hw/misc/macio/macio.h
> @@ -33,7 +33,7 @@
>   #include "hw/misc/macio/cuda.h"
>   #include "hw/misc/macio/gpio.h"
>   #include "hw/misc/macio/pmu.h"
> -#include "hw/ppc/mac.h"
> +#include "hw/nvram/mac_nvram.h"
>   #include "hw/ppc/mac_dbdma.h"
>   #include "hw/ppc/openpic.h"
>   #include "qom/object.h"
> diff --git a/hw/ppc/mac.h b/include/hw/nvram/mac_nvram.h
> similarity index 88%
> rename from hw/ppc/mac.h
> rename to include/hw/nvram/mac_nvram.h
> index 3c0c3cc43d..805554b2c6 100644
> --- a/hw/ppc/mac.h
> +++ b/include/hw/nvram/mac_nvram.h
> @@ -1,5 +1,5 @@
>   /*
> - * QEMU PowerMac emulation shared definitions and prototypes
> + * PowerMac NVRAM emulation
>    *
>    * Copyright (c) 2004-2007 Fabrice Bellard
>    * Copyright (c) 2007 Jocelyn Mayer
> @@ -23,13 +23,12 @@
>    * THE SOFTWARE.
>    */
>   
> -#ifndef PPC_MAC_H
> -#define PPC_MAC_H
> +#ifndef MAC_NVRAM_H
> +#define MAC_NVRAM_H
>   
>   #include "exec/memory.h"
>   #include "hw/sysbus.h"
>   
> -/* Mac NVRAM */
>   #define TYPE_MACIO_NVRAM "macio-nvram"
>   OBJECT_DECLARE_SIMPLE_TYPE(MacIONVRAMState, MACIO_NVRAM)
>   
> @@ -45,5 +44,6 @@ struct MacIONVRAMState {
>       uint8_t *data;
>   };
>   
> -void pmac_format_nvram_partition (MacIONVRAMState *nvr, int len);
> -#endif /* PPC_MAC_H */
> +void pmac_format_nvram_partition(MacIONVRAMState *nvr, int len);
> +
> +#endif /* MAC_NVRAM_H */

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


ATB,

Mark.
diff mbox series

Patch

diff --git a/MAINTAINERS b/MAINTAINERS
index 1729c0901c..6d34e81246 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1328,6 +1328,7 @@  F: hw/nvram/mac_nvram.c
 F: hw/input/adb*
 F: include/hw/misc/macio/
 F: include/hw/misc/mos6522.h
+F: include/hw/nvram/mac_nvram.h
 F: include/hw/ppc/mac_dbdma.h
 F: include/hw/pci-host/uninorth.h
 F: include/hw/input/adb*
diff --git a/hw/ide/macio.c b/hw/ide/macio.c
index 1c15c37ec5..e604466acb 100644
--- a/hw/ide/macio.c
+++ b/hw/ide/macio.c
@@ -24,7 +24,6 @@ 
  */
 
 #include "qemu/osdep.h"
-#include "hw/ppc/mac.h"
 #include "hw/ppc/mac_dbdma.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
diff --git a/hw/intc/heathrow_pic.c b/hw/intc/heathrow_pic.c
index cb97c315da..13048a2735 100644
--- a/hw/intc/heathrow_pic.c
+++ b/hw/intc/heathrow_pic.c
@@ -24,7 +24,6 @@ 
  */
 
 #include "qemu/osdep.h"
-#include "hw/ppc/mac.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"
 #include "hw/intc/heathrow_pic.h"
diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c
index b0787e8ee7..c757adbe53 100644
--- a/hw/intc/openpic.c
+++ b/hw/intc/openpic.c
@@ -32,7 +32,6 @@ 
 
 #include "qemu/osdep.h"
 #include "hw/irq.h"
-#include "hw/ppc/mac.h"
 #include "hw/pci/pci.h"
 #include "hw/ppc/openpic.h"
 #include "hw/ppc/ppc_e500.h"
diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c
index 1498113cfc..0d4c13319a 100644
--- a/hw/misc/macio/cuda.c
+++ b/hw/misc/macio/cuda.c
@@ -25,7 +25,6 @@ 
 
 #include "qemu/osdep.h"
 #include "hw/irq.h"
-#include "hw/ppc/mac.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/input/adb.h"
diff --git a/hw/misc/macio/gpio.c b/hw/misc/macio/gpio.c
index b1bcf830c3..c8ac5633b2 100644
--- a/hw/misc/macio/gpio.c
+++ b/hw/misc/macio/gpio.c
@@ -24,7 +24,6 @@ 
  */
 
 #include "qemu/osdep.h"
-#include "hw/ppc/mac.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/misc/macio/macio.h"
diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c
index eca5983a4d..782207647c 100644
--- a/hw/misc/macio/macio.c
+++ b/hw/misc/macio/macio.c
@@ -26,7 +26,6 @@ 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/module.h"
-#include "hw/ppc/mac.h"
 #include "hw/misc/macio/cuda.h"
 #include "hw/pci/pci.h"
 #include "hw/ppc/mac_dbdma.h"
diff --git a/hw/misc/macio/pmu.c b/hw/misc/macio/pmu.c
index 336502a84b..70562ed8d0 100644
--- a/hw/misc/macio/pmu.c
+++ b/hw/misc/macio/pmu.c
@@ -29,7 +29,6 @@ 
  */
 
 #include "qemu/osdep.h"
-#include "hw/ppc/mac.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/input/adb.h"
diff --git a/hw/nvram/mac_nvram.c b/hw/nvram/mac_nvram.c
index 11f2d31cdb..3d9ddda217 100644
--- a/hw/nvram/mac_nvram.c
+++ b/hw/nvram/mac_nvram.c
@@ -25,7 +25,7 @@ 
 
 #include "qemu/osdep.h"
 #include "hw/nvram/chrp_nvram.h"
-#include "hw/ppc/mac.h"
+#include "hw/nvram/mac_nvram.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qemu/cutils.h"
diff --git a/hw/pci-host/grackle.c b/hw/pci-host/grackle.c
index 5282123004..d9c11d22e0 100644
--- a/hw/pci-host/grackle.c
+++ b/hw/pci-host/grackle.c
@@ -25,7 +25,6 @@ 
 
 #include "qemu/osdep.h"
 #include "hw/pci/pci_host.h"
-#include "hw/ppc/mac.h"
 #include "hw/qdev-properties.h"
 #include "hw/pci/pci.h"
 #include "hw/irq.h"
diff --git a/hw/pci-host/uninorth.c b/hw/pci-host/uninorth.c
index d25b62d6a5..aebd44d265 100644
--- a/hw/pci-host/uninorth.c
+++ b/hw/pci-host/uninorth.c
@@ -24,7 +24,6 @@ 
 
 #include "qemu/osdep.h"
 #include "hw/irq.h"
-#include "hw/ppc/mac.h"
 #include "hw/qdev-properties.h"
 #include "qemu/module.h"
 #include "hw/pci/pci.h"
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 1cb10726d3..9cec30bbd3 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -52,7 +52,7 @@ 
 #include "qapi/error.h"
 #include "hw/ppc/ppc.h"
 #include "hw/qdev-properties.h"
-#include "hw/ppc/mac.h"
+#include "hw/nvram/mac_nvram.h"
 #include "hw/boards.h"
 #include "hw/pci-host/uninorth.h"
 #include "hw/input/adb.h"
diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index e196090f49..27d7c19f00 100644
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -30,7 +30,6 @@ 
 #include "qapi/error.h"
 #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"
diff --git a/include/hw/misc/macio/macio.h b/include/hw/misc/macio/macio.h
index 6c05f3bfd2..aebe990270 100644
--- a/include/hw/misc/macio/macio.h
+++ b/include/hw/misc/macio/macio.h
@@ -33,7 +33,7 @@ 
 #include "hw/misc/macio/cuda.h"
 #include "hw/misc/macio/gpio.h"
 #include "hw/misc/macio/pmu.h"
-#include "hw/ppc/mac.h"
+#include "hw/nvram/mac_nvram.h"
 #include "hw/ppc/mac_dbdma.h"
 #include "hw/ppc/openpic.h"
 #include "qom/object.h"
diff --git a/hw/ppc/mac.h b/include/hw/nvram/mac_nvram.h
similarity index 88%
rename from hw/ppc/mac.h
rename to include/hw/nvram/mac_nvram.h
index 3c0c3cc43d..805554b2c6 100644
--- a/hw/ppc/mac.h
+++ b/include/hw/nvram/mac_nvram.h
@@ -1,5 +1,5 @@ 
 /*
- * QEMU PowerMac emulation shared definitions and prototypes
+ * PowerMac NVRAM emulation
  *
  * Copyright (c) 2004-2007 Fabrice Bellard
  * Copyright (c) 2007 Jocelyn Mayer
@@ -23,13 +23,12 @@ 
  * THE SOFTWARE.
  */
 
-#ifndef PPC_MAC_H
-#define PPC_MAC_H
+#ifndef MAC_NVRAM_H
+#define MAC_NVRAM_H
 
 #include "exec/memory.h"
 #include "hw/sysbus.h"
 
-/* Mac NVRAM */
 #define TYPE_MACIO_NVRAM "macio-nvram"
 OBJECT_DECLARE_SIMPLE_TYPE(MacIONVRAMState, MACIO_NVRAM)
 
@@ -45,5 +44,6 @@  struct MacIONVRAMState {
     uint8_t *data;
 };
 
-void pmac_format_nvram_partition (MacIONVRAMState *nvr, int len);
-#endif /* PPC_MAC_H */
+void pmac_format_nvram_partition(MacIONVRAMState *nvr, int len);
+
+#endif /* MAC_NVRAM_H */