aboutsummaryrefslogtreecommitdiff
path: root/hw/input
diff options
context:
space:
mode:
authorMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>2022-06-24 14:40:38 +0100
committerMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>2022-06-26 18:40:11 +0100
commitd4f5b4d87945d2a0f02fea8b42439d24c809c458 (patch)
tree9ba116c709c5b0ee18c6f18fa8da795aa6c38f0d /hw/input
parent57f6c3aac08d16eb7fe4a447dbbbfeb314d39234 (diff)
downloadqemu-d4f5b4d87945d2a0f02fea8b42439d24c809c458.zip
qemu-d4f5b4d87945d2a0f02fea8b42439d24c809c458.tar.gz
qemu-d4f5b4d87945d2a0f02fea8b42439d24c809c458.tar.bz2
pckbd: add mask qdev property to I8042_MMIO device
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>
Diffstat (limited to 'hw/input')
-rw-r--r--hw/input/pckbd.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
index 7b520d0..c04a2c5 100644
--- a/hw/input/pckbd.c
+++ b/hw/input/pckbd.c
@@ -673,11 +673,17 @@ static void i8042_mmio_reset(DeviceState *dev)
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)
{
DeviceClass *dc = DEVICE_CLASS(klass);
dc->reset = i8042_mmio_reset;
+ device_class_set_props(dc, i8042_mmio_properties);
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;
dev = qdev_new(TYPE_I8042_MMIO);
+ qdev_prop_set_uint64(dev, "mask", mask);
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
s = &I8042_MMIO(dev)->kbd;
s->irq_kbd = kbd_irq;
s->irq_mouse = mouse_irq;
- s->mask = mask;
s->extended_state = true;