diff options
| -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 4b3264a02d..e602e3c986 100644 --- a/hw/input/lasips2.c +++ b/hw/input/lasips2.c @@ -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); } @@ -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); } diff --git a/include/hw/input/lasips2.h b/include/hw/input/lasips2.h index 4a0ad999d7..01911c50f9 100644 --- a/include/hw/input/lasips2.h +++ b/include/hw/input/lasips2.h @@ -61,6 +61,8 @@ OBJECT_DECLARE_SIMPLE_TYPE(LASIPS2MousePort, LASIPS2_MOUSE_PORT) struct LASIPS2MousePort { LASIPS2Port parent_obj; + + PS2MouseState mouse; }; struct LASIPS2State { |