ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/pcmcia: Remove PCMCIACardState from "qemu/typedefs.h" 

There is only one header file requiring this typedef (hw/arm/pxa.h),
let it include "hw/pcmcia.h" directly to simplify "qemu/typedefs.h".

To clean "qemu/typedefs.h", move the declaration to "hw/pcmcia.h"
(removing the forward declaration).

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
[thuth: slightly tweaked commit message]
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2019-01-11 15:08:44 +01:00 committed by Thomas Huth
parent fa9414e969
commit 2274e7ddd1
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/hw/arm/pxa.h
View File

@ -12,6 +12,7 @@
#include "exec/memory.h" #include "exec/memory.h"
#include "target/arm/cpu-qom.h" #include "target/arm/cpu-qom.h"
#include "hw/pcmcia.h"
/* Interrupt numbers */ /* Interrupt numbers */
# define PXA2XX_PIC_SSP3 0 # define PXA2XX_PIC_SSP3 0

4
include/hw/pcmcia.h
View File

@ -18,13 +18,13 @@ typedef struct PCMCIASocket {
#define PCMCIA_CARD_CLASS(cls) \ #define PCMCIA_CARD_CLASS(cls) \
OBJECT_CLASS_CHECK(PCMCIACardClass, cls, TYPE_PCMCIA_CARD) OBJECT_CLASS_CHECK(PCMCIACardClass, cls, TYPE_PCMCIA_CARD)
struct PCMCIACardState { typedef struct PCMCIACardState {
/*< private >*/ /*< private >*/
DeviceState parent_obj; DeviceState parent_obj;
/*< public >*/ /*< public >*/
PCMCIASocket *slot; PCMCIASocket *slot;
}; } PCMCIACardState;
typedef struct PCMCIACardClass { typedef struct PCMCIACardClass {
/*< private >*/ /*< private >*/

1
include/qemu/typedefs.h
View File

@ -78,7 +78,6 @@ typedef struct PCIHostDeviceAddress PCIHostDeviceAddress;
typedef struct PCIHostState PCIHostState; typedef struct PCIHostState PCIHostState;
typedef struct PCMachineClass PCMachineClass; typedef struct PCMachineClass PCMachineClass;
typedef struct PCMachineState PCMachineState; typedef struct PCMachineState PCMachineState;
typedef struct PCMCIACardState PCMCIACardState;
typedef struct PixelFormat PixelFormat; typedef struct PixelFormat PixelFormat;
typedef struct PostcopyDiscardState PostcopyDiscardState; typedef struct PostcopyDiscardState PostcopyDiscardState;
typedef struct Property Property; typedef struct Property Property;