[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 5/6] hw/input/lasips2: Move LASIPS2State declaration to 'hw/input/
From: |
Laurent Vivier |
Subject: |
[PULL 5/6] hw/input/lasips2: Move LASIPS2State declaration to 'hw/input/lasips2.h' |
Date: |
Mon, 1 Nov 2021 09:27:46 +0100 |
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
We want to use the OBJECT_DECLARE_SIMPLE_TYPE() macro to QOM'ify
this device in the next commit. To make its review simpler, as a
first step move the LASIPS2State and LASIPS2Port declarations to
'hw/input/lasips2.h'
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Damien Hedde <damien.hedde@greensocs.com>
Message-Id: <20210920064048.2729397-3-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/input/lasips2.c | 18 ------------------
include/hw/input/lasips2.h | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/hw/input/lasips2.c b/hw/input/lasips2.c
index 68d741d34215..0f8362f17bc1 100644
--- a/hw/input/lasips2.c
+++ b/hw/input/lasips2.c
@@ -33,24 +33,6 @@
#include "hw/irq.h"
-struct LASIPS2State;
-typedef struct LASIPS2Port {
- struct LASIPS2State *parent;
- MemoryRegion reg;
- void *dev;
- uint8_t id;
- uint8_t control;
- uint8_t buf;
- bool loopback_rbne;
- bool irq;
-} LASIPS2Port;
-
-typedef struct LASIPS2State {
- LASIPS2Port kbd;
- LASIPS2Port mouse;
- qemu_irq irq;
-} LASIPS2State;
-
static const VMStateDescription vmstate_lasips2 = {
.name = "lasips2",
.version_id = 0,
diff --git a/include/hw/input/lasips2.h b/include/hw/input/lasips2.h
index 0cd7b59064a9..c88f1700162a 100644
--- a/include/hw/input/lasips2.h
+++ b/include/hw/input/lasips2.h
@@ -11,6 +11,24 @@
#define TYPE_LASIPS2 "lasips2"
+struct LASIPS2State;
+typedef struct LASIPS2Port {
+ struct LASIPS2State *parent;
+ MemoryRegion reg;
+ void *dev;
+ uint8_t id;
+ uint8_t control;
+ uint8_t buf;
+ bool loopback_rbne;
+ bool irq;
+} LASIPS2Port;
+
+typedef struct LASIPS2State {
+ LASIPS2Port kbd;
+ LASIPS2Port mouse;
+ qemu_irq irq;
+} LASIPS2State;
+
void lasips2_init(MemoryRegion *address_space, hwaddr base, qemu_irq irq);
#endif /* HW_INPUT_LASIPS2_H */
--
2.31.1
- [PULL 0/6] Trivial branch for 6.2 patches, Laurent Vivier, 2021/11/01
- [PULL 1/6] monitor: Trim some trailing space from human-readable output, Laurent Vivier, 2021/11/01
- [PULL 3/6] MAINTAINERS: Split HPPA TCG vs HPPA machines/hardware, Laurent Vivier, 2021/11/01
- [PULL 5/6] hw/input/lasips2: Move LASIPS2State declaration to 'hw/input/lasips2.h',
Laurent Vivier <=
- [PULL 2/6] hw/core/machine: Add the missing delimiter in cpu_slot_to_string(), Laurent Vivier, 2021/11/01
- [PULL 4/6] hw/input/lasips2: Fix typos in function names, Laurent Vivier, 2021/11/01
- [PULL 6/6] hw/input/lasips2: QOM'ify the Lasi PS/2, Laurent Vivier, 2021/11/01