diff options
| author | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2022-07-12 22:52:19 +0100 |
|---|---|---|
| committer | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2022-07-18 19:28:45 +0100 |
| commit | 87efd2829bf8ec78b4cea53eab3133e1de4e0cc7 (patch) | |
| tree | 4f368bb1f0dd1b2cd57d1cc5ac8f7300efbf4c93 /hw/input | |
| parent | 475a4d463b20ba64cf2d87ac75c6a536b018cfa3 (diff) | |
pl050: introduce pl050_kbd_class_init() and pl050_kbd_realize()
Introduce a new pl050_kbd_class_init() function containing a call to
device_class_set_parent_realize() which calls a new pl050_kbd_realize()
function to initialise the PS2 keyboard 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-9-mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Diffstat (limited to 'hw/input')
| -rw-r--r-- | hw/input/pl050.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/hw/input/pl050.c b/hw/input/pl050.c index d7796b73a1..24363c007e 100644 --- a/hw/input/pl050.c +++ b/hw/input/pl050.c @@ -155,14 +155,21 @@ static void pl050_realize(DeviceState *dev, Error **errp) if (s->is_mouse) { s->ps2dev = ps2_mouse_init(); - } else { - s->ps2dev = ps2_kbd_init(); } qdev_connect_gpio_out(DEVICE(s->ps2dev), PS2_DEVICE_IRQ, qdev_get_gpio_in_named(dev, "ps2-input-irq", 0)); } +static void pl050_kbd_realize(DeviceState *dev, Error **errp) +{ + PL050DeviceClass *pdc = PL050_GET_CLASS(dev); + PL050State *ps = PL050(dev); + + ps->ps2dev = ps2_kbd_init(); + pdc->parent_realize(dev, errp); +} + static void pl050_kbd_init(Object *obj) { PL050State *s = PL050(obj); @@ -177,11 +184,21 @@ static void pl050_mouse_init(Object *obj) s->is_mouse = true; } +static void pl050_kbd_class_init(ObjectClass *oc, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(oc); + PL050DeviceClass *pdc = PL050_CLASS(oc); + + device_class_set_parent_realize(dc, pl050_kbd_realize, + &pdc->parent_realize); +} + static const TypeInfo pl050_kbd_info = { .name = TYPE_PL050_KBD_DEVICE, .parent = TYPE_PL050, .instance_init = pl050_kbd_init, .instance_size = sizeof(PL050KbdState), + .class_init = pl050_kbd_class_init, }; static const TypeInfo pl050_mouse_info = { |