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

pl050: introduce pl050_mouse_class_init() and pl050_mouse_realize()

Browse Source 
Introduce a new pl050_mouse_class_init() function containing a call to
device_class_set_parent_realize() which calls a new pl050_mouse_realize()
function to initialise the PS2 mouse device.

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-10-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:20 +01:00
parent 87efd2829b
commit 5b0138b314
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hw/input/pl050.c
View File

@ -153,10 +153,6 @@ static void pl050_realize(DeviceState *dev, Error **errp)
{ {
PL050State *s = PL050(dev); PL050State *s = PL050(dev);
if (s->is_mouse) {
s->ps2dev = ps2_mouse_init();
}
qdev_connect_gpio_out(DEVICE(s->ps2dev), PS2_DEVICE_IRQ, qdev_connect_gpio_out(DEVICE(s->ps2dev), PS2_DEVICE_IRQ,
qdev_get_gpio_in_named(dev, "ps2-input-irq", 0)); qdev_get_gpio_in_named(dev, "ps2-input-irq", 0));
} }
@ -177,6 +173,15 @@ static void pl050_kbd_init(Object *obj)
s->is_mouse = false; s->is_mouse = false;
} }
static void pl050_mouse_realize(DeviceState *dev, Error **errp)
{
PL050DeviceClass *pdc = PL050_GET_CLASS(dev);
PL050State *ps = PL050(dev);
ps->ps2dev = ps2_mouse_init();
pdc->parent_realize(dev, errp);
}
static void pl050_mouse_init(Object *obj) static void pl050_mouse_init(Object *obj)
{ {
PL050State *s = PL050(obj); PL050State *s = PL050(obj);
@ -201,11 +206,21 @@ static const TypeInfo pl050_kbd_info = {
.class_init = pl050_kbd_class_init, .class_init = pl050_kbd_class_init,
}; };
static void pl050_mouse_class_init(ObjectClass *oc, void *data)
{
DeviceClass *dc = DEVICE_CLASS(oc);
PL050DeviceClass *pdc = PL050_CLASS(oc);
device_class_set_parent_realize(dc, pl050_mouse_realize,
&pdc->parent_realize);
}
static const TypeInfo pl050_mouse_info = { static const TypeInfo pl050_mouse_info = {
.name = TYPE_PL050_MOUSE_DEVICE, .name = TYPE_PL050_MOUSE_DEVICE,
.parent = TYPE_PL050, .parent = TYPE_PL050,
.instance_init = pl050_mouse_init, .instance_init = pl050_mouse_init,
.instance_size = sizeof(PL050MouseState), .instance_size = sizeof(PL050MouseState),
.class_init = pl050_mouse_class_init,
}; };
static void pl050_init(Object *obj) static void pl050_init(Object *obj)