[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 22/54] pckbd: implement i8042_mmio_reset() for I8042_MMIO devi
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v2 22/54] pckbd: implement i8042_mmio_reset() for I8042_MMIO device |
Date: |
Fri, 24 Jun 2022 14:40:37 +0100 |
This allows the I8042_MMIO reset function to be registered directly within the
DeviceClass rather than using qemu_register_reset() directly.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Helge Deller <deller@gmx.de>
---
hw/input/pckbd.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
index 89a41ed566..7b520d0eb4 100644
--- a/hw/input/pckbd.c
+++ b/hw/input/pckbd.c
@@ -665,10 +665,19 @@ static const MemoryRegionOps i8042_mmio_ops = {
.endianness = DEVICE_NATIVE_ENDIAN,
};
+static void i8042_mmio_reset(DeviceState *dev)
+{
+ MMIOKBDState *s = I8042_MMIO(dev);
+ KBDState *ks = &s->kbd;
+
+ kbd_reset(ks);
+}
+
static void i8042_mmio_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
+ dc->reset = i8042_mmio_reset;
set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
}
@@ -695,7 +704,6 @@ void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,
s->kbd = ps2_kbd_init(kbd_update_kbd_irq, s);
s->mouse = ps2_mouse_init(kbd_update_aux_irq, s);
- qemu_register_reset(kbd_reset, s);
}
static const TypeInfo i8042_mmio_info = {
--
2.30.2
- [PATCH v2 12/54] ps2: don't use vmstate_register() in ps2_kbd_init(), (continued)
- [PATCH v2 12/54] ps2: don't use vmstate_register() in ps2_kbd_init(), Mark Cave-Ayland, 2022/06/24
- [PATCH v2 13/54] ps2: don't use vmstate_register() in ps2_mouse_init(), Mark Cave-Ayland, 2022/06/24
- [PATCH v2 14/54] pl050: checkpatch fixes, Mark Cave-Ayland, 2022/06/24
- [PATCH v2 15/54] pl050: split pl050_update_irq() into separate pl050_set_irq() and pl050_update_irq() functions, Mark Cave-Ayland, 2022/06/24
- [PATCH v2 16/54] lasips2: spacing fixes, Mark Cave-Ayland, 2022/06/24
- [PATCH v2 17/54] lasips2: rename ps2dev_update_irq() to lasips2_port_set_irq(), Mark Cave-Ayland, 2022/06/24
- [PATCH v2 20/54] pckbd: move ISAKBDState from pckbd.c to i8042.h, Mark Cave-Ayland, 2022/06/24
- [PATCH v2 18/54] pckbd: checkpatch fixes, Mark Cave-Ayland, 2022/06/24
- [PATCH v2 21/54] pckbd: introduce new I8042_MMIO QOM type, Mark Cave-Ayland, 2022/06/24
- [PATCH v2 19/54] pckbd: move KBDState from pckbd.c to i8042.h, Mark Cave-Ayland, 2022/06/24
- [PATCH v2 22/54] pckbd: implement i8042_mmio_reset() for I8042_MMIO device,
Mark Cave-Ayland <=
- [PATCH v2 23/54] pckbd: add mask qdev property to I8042_MMIO device, Mark Cave-Ayland, 2022/06/24
- [PATCH v2 24/54] pckbd: add size qdev property to I8042_MMIO device, Mark Cave-Ayland, 2022/06/24
- [PATCH v2 25/54] pckbd: implement i8042_mmio_realize() function, Mark Cave-Ayland, 2022/06/24
- [PATCH v2 26/54] pckbd: implement i8042_mmio_init() function, Mark Cave-Ayland, 2022/06/24
- [PATCH v2 27/54] pckbd: alter i8042_mm_init() to return a I8042_MMIO device, Mark Cave-Ayland, 2022/06/24
- [PATCH v2 28/54] pckbd: move mapping of I8042_MMIO registers to MIPS magnum machine, Mark Cave-Ayland, 2022/06/24
- [PATCH v2 29/54] pckbd: more vmstate_register() from i8042_mm_init() to i8042_mmio_realize(), Mark Cave-Ayland, 2022/06/24