[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH 3/4] hw/ssi: Remove SSIBus from qemu/typedefs.h
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [RFC PATCH 3/4] hw/ssi: Remove SSIBus from qemu/typedefs.h |
Date: |
Tue, 8 May 2018 12:10:34 -0300 |
There are only two files requiring this typedef (strongarm.h
and hw/arm/pxa.h), let them include "hw/pcmcia.h" directly to
simplify qemu/typedefs.h.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/arm/strongarm.h | 1 +
include/hw/arm/pxa.h | 1 +
include/hw/ssi/ssi.h | 1 +
include/qemu/typedefs.h | 1 -
4 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/hw/arm/strongarm.h b/hw/arm/strongarm.h
index e98840b461..ae51a1ae34 100644
--- a/hw/arm/strongarm.h
+++ b/hw/arm/strongarm.h
@@ -3,6 +3,7 @@
#include "exec/memory.h"
#include "target/arm/cpu-qom.h"
+#include "hw/ssi/ssi.h"
#define SA_CS0 0x00000000
#define SA_CS1 0x08000000
diff --git a/include/hw/arm/pxa.h b/include/hw/arm/pxa.h
index f6dfb5c0cf..f184349f02 100644
--- a/include/hw/arm/pxa.h
+++ b/include/hw/arm/pxa.h
@@ -13,6 +13,7 @@
#include "exec/memory.h"
#include "target/arm/cpu-qom.h"
#include "hw/pcmcia.h"
+#include "hw/ssi/ssi.h"
/* Interrupt numbers */
# define PXA2XX_PIC_SSP3 0
diff --git a/include/hw/ssi/ssi.h b/include/hw/ssi/ssi.h
index 6a0c3c3cdb..bdbf3c51f5 100644
--- a/include/hw/ssi/ssi.h
+++ b/include/hw/ssi/ssi.h
@@ -13,6 +13,7 @@
#include "hw/qdev.h"
+typedef struct SSIBus SSIBus;
typedef struct SSISlave SSISlave;
typedef struct SSISlaveClass SSISlaveClass;
typedef enum SSICSMode SSICSMode;
diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
index c7a0159bd2..b4dc63a466 100644
--- a/include/qemu/typedefs.h
+++ b/include/qemu/typedefs.h
@@ -106,7 +106,6 @@ typedef struct Range Range;
typedef struct SerialState SerialState;
typedef struct SHPCDevice SHPCDevice;
typedef struct SMBusDevice SMBusDevice;
-typedef struct SSIBus SSIBus;
typedef struct uWireSlave uWireSlave;
typedef struct VirtIODevice VirtIODevice;
typedef struct Visitor Visitor;
--
2.17.0