Skip to content

Commit

Permalink
lasips2: don't use legacy ps2_mouse_init() function
Browse files Browse the repository at this point in the history
Instantiate the PS2 mouse device within LASIPS2MousePort using
object_initialize_child() in lasips2_mouse_port_init() and realize it in
lasips2_mouse_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-34-mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
  • Loading branch information
mcayland committed Jul 18, 2022
1 parent e2b50ae commit d316983
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
10 changes: 9 additions & 1 deletion hw/input/lasips2.c
Original file line number Diff line number Diff line change
Expand Up @@ -398,10 +398,15 @@ static const TypeInfo lasips2_kbd_port_info = {

static void lasips2_mouse_port_realize(DeviceState *dev, Error **errp)
{
LASIPS2MousePort *s = LASIPS2_MOUSE_PORT(dev);
LASIPS2Port *lp = LASIPS2_PORT(dev);
LASIPS2PortDeviceClass *lpdc = LASIPS2_PORT_GET_CLASS(lp);

lp->ps2dev = ps2_mouse_init();
if (!sysbus_realize(SYS_BUS_DEVICE(&s->mouse), errp)) {
return;
}

lp->ps2dev = PS2_DEVICE(&s->mouse);
lpdc->parent_realize(dev, errp);
}

Expand All @@ -412,6 +417,9 @@ static void lasips2_mouse_port_init(Object *obj)

memory_region_init_io(&lp->reg, obj, &lasips2_reg_ops, lp, "lasips2-mouse",
0x100);

object_initialize_child(obj, "mouse", &s->mouse, TYPE_PS2_MOUSE_DEVICE);

lp->id = 1;
lp->lasips2 = container_of(s, LASIPS2State, mouse_port);
}
Expand Down
2 changes: 2 additions & 0 deletions include/hw/input/lasips2.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ OBJECT_DECLARE_SIMPLE_TYPE(LASIPS2MousePort, LASIPS2_MOUSE_PORT)

struct LASIPS2MousePort {
LASIPS2Port parent_obj;

PS2MouseState mouse;
};

struct LASIPS2State {
Expand Down

0 comments on commit d316983

Please sign in to comment.