diff options
| author | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2022-06-24 14:40:40 +0100 |
|---|---|---|
| committer | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2022-06-26 18:40:12 +0100 |
| commit | f4de68d1d45f1f104535a82f3e0dd3c393c6539e (patch) | |
| tree | e7357ff6dec59374f3641bde394d2fa0ee5c078d /hw/input | |
| parent | 7b9fff290c20ee65c5deba0ad98f97529061d231 (diff) | |
| download | qemu-f4de68d1d45f1f104535a82f3e0dd3c393c6539e.zip qemu-f4de68d1d45f1f104535a82f3e0dd3c393c6539e.tar.gz qemu-f4de68d1d45f1f104535a82f3e0dd3c393c6539e.tar.bz2 | |
pckbd: implement i8042_mmio_realize() function
Move the initialisation of the register memory region to the I8042_MMIO device
realize function and expose it using sysbus_init_mmio().
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-26-mark.cave-ayland@ilande.co.uk>
Diffstat (limited to 'hw/input')
| -rw-r--r-- | hw/input/pckbd.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c index a70442e..bc51f7e 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.c @@ -673,6 +673,17 @@ static void i8042_mmio_reset(DeviceState *dev) kbd_reset(ks); } +static void i8042_mmio_realize(DeviceState *dev, Error **errp) +{ + MMIOKBDState *s = I8042_MMIO(dev); + KBDState *ks = &s->kbd; + + memory_region_init_io(&s->region, OBJECT(dev), &i8042_mmio_ops, ks, + "i8042", s->size); + + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->region); +} + static Property i8042_mmio_properties[] = { DEFINE_PROP_UINT64("mask", MMIOKBDState, kbd.mask, UINT64_MAX), DEFINE_PROP_UINT32("size", MMIOKBDState, size, -1), @@ -683,6 +694,7 @@ static void i8042_mmio_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); + dc->realize = i8042_mmio_realize; dc->reset = i8042_mmio_reset; device_class_set_props(dc, i8042_mmio_properties); set_bit(DEVICE_CATEGORY_INPUT, dc->categories); @@ -708,7 +720,7 @@ void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq, vmstate_register(NULL, 0, &vmstate_kbd, s); - memory_region_init_io(region, NULL, &i8042_mmio_ops, s, "i8042", size); + region = &I8042_MMIO(dev)->region; s->kbd = ps2_kbd_init(kbd_update_kbd_irq, s); s->mouse = ps2_mouse_init(kbd_update_aux_irq, s); |