[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 19/55] pckbd: move KBDState from pckbd.c to i8042.h
From: |
Mark Cave-Ayland |
Subject: |
[PULL 19/55] pckbd: move KBDState from pckbd.c to i8042.h |
Date: |
Sun, 26 Jun 2022 18:44:55 +0100 |
This allows the QOM types in pckbd.c to be used elsewhere by simply including
i8042.h.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: Helge Deller <deller@gmx.de>
Message-Id: <20220624134109.881989-20-mark.cave-ayland@ilande.co.uk>
---
hw/input/pckbd.c | 24 ------------------------
include/hw/input/i8042.h | 25 +++++++++++++++++++++++++
2 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
index c18a1a7fae..7b14cd007e 100644
--- a/hw/input/pckbd.c
+++ b/hw/input/pckbd.c
@@ -146,30 +146,6 @@
#define KBD_OBSRC_MOUSE 0x02
#define KBD_OBSRC_CTRL 0x04
-typedef struct KBDState {
- uint8_t write_cmd; /* if non zero, write data to port 60 is expected */
- uint8_t status;
- uint8_t mode;
- uint8_t outport;
- uint32_t migration_flags;
- uint32_t obsrc;
- bool outport_present;
- bool extended_state;
- bool extended_state_loaded;
- /* Bitmask of devices with data available. */
- uint8_t pending;
- uint8_t obdata;
- uint8_t cbdata;
- uint8_t pending_tmp;
- void *kbd;
- void *mouse;
- QEMUTimer *throttle_timer;
-
- qemu_irq irq_kbd;
- qemu_irq irq_mouse;
- qemu_irq a20_out;
- hwaddr mask;
-} KBDState;
/*
* XXX: not generating the irqs if KBD_MODE_DISABLE_KBD is set may be
diff --git a/include/hw/input/i8042.h b/include/hw/input/i8042.h
index e070f546e4..84b5aa7f23 100644
--- a/include/hw/input/i8042.h
+++ b/include/hw/input/i8042.h
@@ -11,6 +11,31 @@
#include "hw/isa/isa.h"
#include "qom/object.h"
+typedef struct KBDState {
+ uint8_t write_cmd; /* if non zero, write data to port 60 is expected */
+ uint8_t status;
+ uint8_t mode;
+ uint8_t outport;
+ uint32_t migration_flags;
+ uint32_t obsrc;
+ bool outport_present;
+ bool extended_state;
+ bool extended_state_loaded;
+ /* Bitmask of devices with data available. */
+ uint8_t pending;
+ uint8_t obdata;
+ uint8_t cbdata;
+ uint8_t pending_tmp;
+ void *kbd;
+ void *mouse;
+ QEMUTimer *throttle_timer;
+
+ qemu_irq irq_kbd;
+ qemu_irq irq_mouse;
+ qemu_irq a20_out;
+ hwaddr mask;
+} KBDState;
+
#define TYPE_I8042 "i8042"
OBJECT_DECLARE_SIMPLE_TYPE(ISAKBDState, I8042)
--
2.30.2
- [PULL 09/55] ps2: remove duplicate setting of scancode_set in ps2_kbd_init(), (continued)
- [PULL 09/55] ps2: remove duplicate setting of scancode_set in ps2_kbd_init(), Mark Cave-Ayland, 2022/06/26
- [PULL 10/55] ps2: implement ps2_kbd_realize() and use it to register ps2_keyboard_handler, Mark Cave-Ayland, 2022/06/26
- [PULL 11/55] ps2: implement ps2_mouse_realize() and use it to register ps2_mouse_handler, Mark Cave-Ayland, 2022/06/26
- [PULL 12/55] ps2: don't use vmstate_register() in ps2_kbd_init(), Mark Cave-Ayland, 2022/06/26
- [PULL 13/55] ps2: don't use vmstate_register() in ps2_mouse_init(), Mark Cave-Ayland, 2022/06/26
- [PULL 14/55] pl050: checkpatch fixes, Mark Cave-Ayland, 2022/06/26
- [PULL 15/55] pl050: split pl050_update_irq() into separate pl050_set_irq() and pl050_update_irq() functions, Mark Cave-Ayland, 2022/06/26
- [PULL 17/55] lasips2: rename ps2dev_update_irq() to lasips2_port_set_irq(), Mark Cave-Ayland, 2022/06/26
- [PULL 16/55] lasips2: spacing fixes, Mark Cave-Ayland, 2022/06/26
- [PULL 20/55] pckbd: move ISAKBDState from pckbd.c to i8042.h, Mark Cave-Ayland, 2022/06/26
- [PULL 19/55] pckbd: move KBDState from pckbd.c to i8042.h,
Mark Cave-Ayland <=
- [PULL 18/55] pckbd: checkpatch fixes, Mark Cave-Ayland, 2022/06/26
- [PULL 21/55] pckbd: introduce new I8042_MMIO QOM type, Mark Cave-Ayland, 2022/06/26
- [PULL 24/55] pckbd: add size qdev property to I8042_MMIO device, Mark Cave-Ayland, 2022/06/26
- [PULL 25/55] pckbd: implement i8042_mmio_realize() function, Mark Cave-Ayland, 2022/06/26
- [PULL 27/55] pckbd: alter i8042_mm_init() to return a I8042_MMIO device, Mark Cave-Ayland, 2022/06/26
- [PULL 23/55] pckbd: add mask qdev property to I8042_MMIO device, Mark Cave-Ayland, 2022/06/26
- [PULL 22/55] pckbd: implement i8042_mmio_reset() for I8042_MMIO device, Mark Cave-Ayland, 2022/06/26
- [PULL 29/55] pckbd: more vmstate_register() from i8042_mm_init() to i8042_mmio_realize(), Mark Cave-Ayland, 2022/06/26
- [PULL 28/55] pckbd: move mapping of I8042_MMIO registers to MIPS magnum machine, Mark Cave-Ayland, 2022/06/26
- [PULL 26/55] pckbd: implement i8042_mmio_init() function, Mark Cave-Ayland, 2022/06/26