From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org,
"Damien Hedde" <damien.hedde@greensocs.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Laurent Vivier" <laurent@vivier.eu>
Subject: [PULL 5/6] hw/input/lasips2: Move LASIPS2State declaration to 'hw/input/lasips2.h'
Date: Mon, 1 Nov 2021 09:27:46 +0100 [thread overview]
Message-ID: <20211101082747.2524909-6-laurent@vivier.eu> (raw)
In-Reply-To: <20211101082747.2524909-1-laurent@vivier.eu>
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
next prev parent reply other threads:[~2021-11-01 8:29 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-01 8:27 [PULL 0/6] Trivial branch for 6.2 patches Laurent Vivier
2021-11-01 8:27 ` [PULL 1/6] monitor: Trim some trailing space from human-readable output Laurent Vivier
2021-11-01 8:27 ` [PULL 2/6] hw/core/machine: Add the missing delimiter in cpu_slot_to_string() Laurent Vivier
2021-11-01 8:27 ` [PULL 3/6] MAINTAINERS: Split HPPA TCG vs HPPA machines/hardware Laurent Vivier
2021-11-01 8:27 ` [PULL 4/6] hw/input/lasips2: Fix typos in function names Laurent Vivier
2021-11-01 8:27 ` Laurent Vivier [this message]
2021-11-01 8:27 ` [PULL 6/6] hw/input/lasips2: QOM'ify the Lasi PS/2 Laurent Vivier
2021-11-01 15:31 ` Richard Henderson
2021-11-01 15:43 ` Philippe Mathieu-Daudé
2021-11-02 16:48 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211101082747.2524909-6-laurent@vivier.eu \
--to=laurent@vivier.eu \
--cc=damien.hedde@greensocs.com \
--cc=f4bug@amsat.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).