motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-21 09:02:00 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

pckbd: implement i8042_mmio_init() function

Browse source 
This enables use to set the required value of extended_state directly during
device init rather than in i8042_mm_init().

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Helge Deller <deller@gmx.de>
Message-Id: <20220624134109.881989-27-mark.cave-ayland@ilande.co.uk>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Mark Cave-Ayland 2022-06-24 14:40:41 +01:00
parent f4de68d1d4
commit 47fc74154c
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
hw/input/pckbd.c
View file

@ -684,6 +684,14 @@ static void i8042_mmio_realize(DeviceState *dev, Error **errp)
sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->region); sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->region);
} }
static void i8042_mmio_init(Object *obj)
{
MMIOKBDState *s = I8042_MMIO(obj);
KBDState *ks = &s->kbd;
ks->extended_state = true;
}
static Property i8042_mmio_properties[] = { static Property i8042_mmio_properties[] = {
DEFINE_PROP_UINT64("mask", MMIOKBDState, kbd.mask, UINT64_MAX), DEFINE_PROP_UINT64("mask", MMIOKBDState, kbd.mask, UINT64_MAX),
DEFINE_PROP_UINT32("size", MMIOKBDState, size, -1), DEFINE_PROP_UINT32("size", MMIOKBDState, size, -1),
@ -716,8 +724,6 @@ void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,
s->irq_kbd = kbd_irq; s->irq_kbd = kbd_irq;
s->irq_mouse = mouse_irq; s->irq_mouse = mouse_irq;
s->extended_state = true;
vmstate_register(NULL, 0, &vmstate_kbd, s); vmstate_register(NULL, 0, &vmstate_kbd, s);
region = &I8042_MMIO(dev)->region; region = &I8042_MMIO(dev)->region;
@ -729,6 +735,7 @@ void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,
static const TypeInfo i8042_mmio_info = { static const TypeInfo i8042_mmio_info = {
.name = TYPE_I8042_MMIO, .name = TYPE_I8042_MMIO,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_init = i8042_mmio_init,
.instance_size = sizeof(MMIOKBDState), .instance_size = sizeof(MMIOKBDState),
.class_init = i8042_mmio_class_init .class_init = i8042_mmio_class_init
}; };