diff options
| author | Mark Cave-Ayland | 2022-07-12 23:52:20 +0200 |
|---|---|---|
| committer | Mark Cave-Ayland | 2022-07-18 20:28:45 +0200 |
| commit | 5b0138b31469a635069d5f645fbeb6c2f998cde2 (patch) | |
| tree | 3e92f6d175ed2db63dc58f4ebfcd48f24b073944 /hw | |
| parent | pl050: introduce pl050_kbd_class_init() and pl050_kbd_realize() (diff) | |
| download | qemu-5b0138b31469a635069d5f645fbeb6c2f998cde2.tar.gz qemu-5b0138b31469a635069d5f645fbeb6c2f998cde2.tar.xz qemu-5b0138b31469a635069d5f645fbeb6c2f998cde2.zip | |
pl050: introduce pl050_mouse_class_init() and pl050_mouse_realize()
Introduce a new pl050_mouse_class_init() function containing a call to
device_class_set_parent_realize() which calls a new pl050_mouse_realize()
function to initialise the PS2 mouse device.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Tested-by: Helge Deller <deller@gmx.de>
Acked-by: Helge Deller <deller@gmx.de>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20220712215251.7944-10-mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/input/pl050.c | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/hw/input/pl050.c b/hw/input/pl050.c index 24363c007e..fcc40758a3 100644 --- a/hw/input/pl050.c +++ b/hw/input/pl050.c @@ -153,10 +153,6 @@ static void pl050_realize(DeviceState *dev, Error **errp) { PL050State *s = PL050(dev); - if (s->is_mouse) { - s->ps2dev = ps2_mouse_init(); - } - qdev_connect_gpio_out(DEVICE(s->ps2dev), PS2_DEVICE_IRQ, qdev_get_gpio_in_named(dev, "ps2-input-irq", 0)); } @@ -177,6 +173,15 @@ static void pl050_kbd_init(Object *obj) s->is_mouse = false; } +static void pl050_mouse_realize(DeviceState *dev, Error **errp) +{ + PL050DeviceClass *pdc = PL050_GET_CLASS(dev); + PL050State *ps = PL050(dev); + + ps->ps2dev = ps2_mouse_init(); + pdc->parent_realize(dev, errp); +} + static void pl050_mouse_init(Object *obj) { PL050State *s = PL050(obj); @@ -201,11 +206,21 @@ static const TypeInfo pl050_kbd_info = { .class_init = pl050_kbd_class_init, }; +static void pl050_mouse_class_init(ObjectClass *oc, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(oc); + PL050DeviceClass *pdc = PL050_CLASS(oc); + + device_class_set_parent_realize(dc, pl050_mouse_realize, + &pdc->parent_realize); +} + static const TypeInfo pl050_mouse_info = { .name = TYPE_PL050_MOUSE_DEVICE, .parent = TYPE_PL050, .instance_init = pl050_mouse_init, .instance_size = sizeof(PL050MouseState), + .class_init = pl050_mouse_class_init, }; static void pl050_init(Object *obj) |