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

pl050: don't use legacy ps2_mouse_init() function

Browse Source 
Instantiate the PS2 mouse device within PL050MouseState using
object_initialize_child() in pl050_mouse_init() and realize it in
pl050_mouse_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-12-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:22 +01:00
parent 6a05d0b3d1
commit 6f9f245b93
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/input/pl050.c
View File

@ -183,17 +183,24 @@ static void pl050_kbd_init(Object *obj)
static void pl050_mouse_realize(DeviceState *dev, Error **errp)
{
PL050DeviceClass *pdc = PL050_GET_CLASS(dev);
PL050MouseState *s = PL050_MOUSE_DEVICE(dev);
PL050State *ps = PL050(dev);
ps->ps2dev = ps2_mouse_init();
if (!sysbus_realize(SYS_BUS_DEVICE(&s->mouse), errp)) {
return;
}
ps->ps2dev = PS2_DEVICE(&s->mouse);
pdc->parent_realize(dev, errp);
}
static void pl050_mouse_init(Object *obj)
{
PL050State *s = PL050(obj);
PL050MouseState *s = PL050_MOUSE_DEVICE(obj);
PL050State *ps = PL050(obj);
s->is_mouse = true;
ps->is_mouse = true;
object_initialize_child(obj, "mouse", &s->mouse, TYPE_PS2_MOUSE_DEVICE);
}
static void pl050_kbd_class_init(ObjectClass *oc, void *data)

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

@ -52,6 +52,8 @@ OBJECT_DECLARE_SIMPLE_TYPE(PL050MouseState, PL050_MOUSE_DEVICE)
struct PL050MouseState {
PL050State parent_obj;
PS2MouseState mouse;
};
#endif