[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 20/55] pckbd: move ISAKBDState from pckbd.c to i8042.h
From: |
Mark Cave-Ayland |
Subject: |
[PULL 20/55] pckbd: move ISAKBDState from pckbd.c to i8042.h |
Date: |
Sun, 26 Jun 2022 18:44:56 +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-21-mark.cave-ayland@ilande.co.uk>
---
hw/input/pckbd.c | 10 ----------
include/hw/input/i8042.h | 10 ++++++++++
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
index 7b14cd007e..f99e10cfcf 100644
--- a/hw/input/pckbd.c
+++ b/hw/input/pckbd.c
@@ -686,16 +686,6 @@ void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,
qemu_register_reset(kbd_reset, s);
}
-struct ISAKBDState {
- ISADevice parent_obj;
-
- KBDState kbd;
- bool kbd_throttle;
- MemoryRegion io[2];
- uint8_t kbd_irq;
- uint8_t mouse_irq;
-};
-
void i8042_isa_mouse_fake_event(ISAKBDState *isa)
{
KBDState *s = &isa->kbd;
diff --git a/include/hw/input/i8042.h b/include/hw/input/i8042.h
index 84b5aa7f23..a246250d1f 100644
--- a/include/hw/input/i8042.h
+++ b/include/hw/input/i8042.h
@@ -39,6 +39,16 @@ typedef struct KBDState {
#define TYPE_I8042 "i8042"
OBJECT_DECLARE_SIMPLE_TYPE(ISAKBDState, I8042)
+struct ISAKBDState {
+ ISADevice parent_obj;
+
+ KBDState kbd;
+ bool kbd_throttle;
+ MemoryRegion io[2];
+ uint8_t kbd_irq;
+ uint8_t mouse_irq;
+};
+
#define I8042_A20_LINE "a20"
--
2.30.2
- [PULL 08/55] ps2: implement ps2_reset() for the PS2_DEVICE QOM type based upon ps2_common_reset(), (continued)
- [PULL 08/55] ps2: implement ps2_reset() for the PS2_DEVICE QOM type based upon ps2_common_reset(), Mark Cave-Ayland, 2022/06/26
- [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 <=
- [PULL 19/55] pckbd: move KBDState from pckbd.c to i8042.h, Mark Cave-Ayland, 2022/06/26
- [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