diff options
| author | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2022-07-12 22:52:43 +0100 |
|---|---|---|
| committer | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2022-07-18 19:28:46 +0100 |
| commit | e2b50aea03fcdcea58057e453e1d9f9a3aa6a7eb (patch) | |
| tree | 8135e144544417de6a7680220624e0238b2dbbd3 | |
| parent | 2ee1b52db1a22dee7856b140b31fae221f72629c (diff) | |
| download | focaccia-qemu-e2b50aea03fcdcea58057e453e1d9f9a3aa6a7eb.tar.gz focaccia-qemu-e2b50aea03fcdcea58057e453e1d9f9a3aa6a7eb.zip | |
lasips2: don't use legacy ps2_kbd_init() function
Instantiate the PS2 keyboard device within LASIPS2KbdPort using object_initialize_child() in lasips2_kbd_port_init() and realize it in lasips2_kbd_port_realize() accordingly. 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-33-mark.cave-ayland@ilande.co.uk> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
| -rw-r--r-- | hw/input/lasips2.c | 10 | ||||
| -rw-r--r-- | include/hw/input/lasips2.h | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/hw/input/lasips2.c b/hw/input/lasips2.c index 7bf6077b58..4b3264a02d 100644 --- a/hw/input/lasips2.c +++ b/hw/input/lasips2.c @@ -353,10 +353,15 @@ static const TypeInfo lasips2_port_info = { static void lasips2_kbd_port_realize(DeviceState *dev, Error **errp) { + LASIPS2KbdPort *s = LASIPS2_KBD_PORT(dev); LASIPS2Port *lp = LASIPS2_PORT(dev); LASIPS2PortDeviceClass *lpdc = LASIPS2_PORT_GET_CLASS(lp); - lp->ps2dev = ps2_kbd_init(); + if (!sysbus_realize(SYS_BUS_DEVICE(&s->kbd), errp)) { + return; + } + + lp->ps2dev = PS2_DEVICE(&s->kbd); lpdc->parent_realize(dev, errp); } @@ -367,6 +372,9 @@ static void lasips2_kbd_port_init(Object *obj) memory_region_init_io(&lp->reg, obj, &lasips2_reg_ops, lp, "lasips2-kbd", 0x100); + + object_initialize_child(obj, "kbd", &s->kbd, TYPE_PS2_KBD_DEVICE); + lp->id = 0; lp->lasips2 = container_of(s, LASIPS2State, kbd_port); } diff --git a/include/hw/input/lasips2.h b/include/hw/input/lasips2.h index 9fe9e63a66..4a0ad999d7 100644 --- a/include/hw/input/lasips2.h +++ b/include/hw/input/lasips2.h @@ -52,6 +52,8 @@ OBJECT_DECLARE_SIMPLE_TYPE(LASIPS2KbdPort, LASIPS2_KBD_PORT) struct LASIPS2KbdPort { LASIPS2Port parent_obj; + + PS2KbdState kbd; }; #define TYPE_LASIPS2_MOUSE_PORT "lasips2-mouse-port" |