mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lasips2: don't use legacy ps2_kbd_init() function

Browse Source 
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>
This commit is contained in:
Mark Cave-Ayland 2022-07-12 22:52:43 +01:00
parent 2ee1b52db1
commit e2b50aea03
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/input/lasips2.c
View File

@ -353,10 +353,15 @@ static const TypeInfo lasips2_port_info = {
static void lasips2_kbd_port_realize(DeviceState *dev, Error **errp) static void lasips2_kbd_port_realize(DeviceState *dev, Error **errp)
{ {
LASIPS2KbdPort *s = LASIPS2_KBD_PORT(dev);
LASIPS2Port *lp = LASIPS2_PORT(dev); LASIPS2Port *lp = LASIPS2_PORT(dev);
LASIPS2PortDeviceClass *lpdc = LASIPS2_PORT_GET_CLASS(lp); 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); 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", memory_region_init_io(&lp->reg, obj, &lasips2_reg_ops, lp, "lasips2-kbd",
0x100); 0x100);
object_initialize_child(obj, "kbd", &s->kbd, TYPE_PS2_KBD_DEVICE);
lp->id = 0; lp->id = 0;
lp->lasips2 = container_of(s, LASIPS2State, kbd_port); lp->lasips2 = container_of(s, LASIPS2State, kbd_port);
} }

2
include/hw/input/lasips2.h
View File

@ -52,6 +52,8 @@ OBJECT_DECLARE_SIMPLE_TYPE(LASIPS2KbdPort, LASIPS2_KBD_PORT)
struct LASIPS2KbdPort { struct LASIPS2KbdPort {
LASIPS2Port parent_obj; LASIPS2Port parent_obj;
PS2KbdState kbd;
}; };
#define TYPE_LASIPS2_MOUSE_PORT "lasips2-mouse-port" #define TYPE_LASIPS2_MOUSE_PORT "lasips2-mouse-port"