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

pckbd: add mask qdev property to I8042_MMIO device

Browse source 
This allows the KBDState mask value to be set using a qdev property rather
than directly in i8042_mm_init().

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

8
hw/input/pckbd.c
View file

@ -673,11 +673,17 @@ static void i8042_mmio_reset(DeviceState *dev)
kbd_reset(ks); kbd_reset(ks);
} }
static Property i8042_mmio_properties[] = {
DEFINE_PROP_UINT64("mask", MMIOKBDState, kbd.mask, UINT64_MAX),
DEFINE_PROP_END_OF_LIST(),
};
static void i8042_mmio_class_init(ObjectClass *klass, void *data) static void i8042_mmio_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
dc->reset = i8042_mmio_reset; dc->reset = i8042_mmio_reset;
device_class_set_props(dc, i8042_mmio_properties);
set_bit(DEVICE_CATEGORY_INPUT, dc->categories); set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
} }
@ -689,12 +695,12 @@ void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,
KBDState *s; KBDState *s;
dev = qdev_new(TYPE_I8042_MMIO); dev = qdev_new(TYPE_I8042_MMIO);
qdev_prop_set_uint64(dev, "mask", mask);
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
s = &I8042_MMIO(dev)->kbd; s = &I8042_MMIO(dev)->kbd;
s->irq_kbd = kbd_irq; s->irq_kbd = kbd_irq;
s->irq_mouse = mouse_irq; s->irq_mouse = mouse_irq;
s->mask = mask;
s->extended_state = true; s->extended_state = true;