mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-08 18:23:57 -06:00
pl050: introduce pl050_kbd_class_init() and pl050_kbd_realize()
Introduce a new pl050_kbd_class_init() function containing a call to device_class_set_parent_realize() which calls a new pl050_kbd_realize() function to initialise the PS2 keyboard 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-9-mark.cave-ayland@ilande.co.uk> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
parent
475a4d463b
commit
87efd2829b
1 changed files with 19 additions and 2 deletions
|
@ -155,14 +155,21 @@ static void pl050_realize(DeviceState *dev, Error **errp)
|
||||||
|
|
||||||
if (s->is_mouse) {
|
if (s->is_mouse) {
|
||||||
s->ps2dev = ps2_mouse_init();
|
s->ps2dev = ps2_mouse_init();
|
||||||
} else {
|
|
||||||
s->ps2dev = ps2_kbd_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));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void pl050_kbd_realize(DeviceState *dev, Error **errp)
|
||||||
|
{
|
||||||
|
PL050DeviceClass *pdc = PL050_GET_CLASS(dev);
|
||||||
|
PL050State *ps = PL050(dev);
|
||||||
|
|
||||||
|
ps->ps2dev = ps2_kbd_init();
|
||||||
|
pdc->parent_realize(dev, errp);
|
||||||
|
}
|
||||||
|
|
||||||
static void pl050_kbd_init(Object *obj)
|
static void pl050_kbd_init(Object *obj)
|
||||||
{
|
{
|
||||||
PL050State *s = PL050(obj);
|
PL050State *s = PL050(obj);
|
||||||
|
@ -177,11 +184,21 @@ static void pl050_mouse_init(Object *obj)
|
||||||
s->is_mouse = true;
|
s->is_mouse = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void pl050_kbd_class_init(ObjectClass *oc, void *data)
|
||||||
|
{
|
||||||
|
DeviceClass *dc = DEVICE_CLASS(oc);
|
||||||
|
PL050DeviceClass *pdc = PL050_CLASS(oc);
|
||||||
|
|
||||||
|
device_class_set_parent_realize(dc, pl050_kbd_realize,
|
||||||
|
&pdc->parent_realize);
|
||||||
|
}
|
||||||
|
|
||||||
static const TypeInfo pl050_kbd_info = {
|
static const TypeInfo pl050_kbd_info = {
|
||||||
.name = TYPE_PL050_KBD_DEVICE,
|
.name = TYPE_PL050_KBD_DEVICE,
|
||||||
.parent = TYPE_PL050,
|
.parent = TYPE_PL050,
|
||||||
.instance_init = pl050_kbd_init,
|
.instance_init = pl050_kbd_init,
|
||||||
.instance_size = sizeof(PL050KbdState),
|
.instance_size = sizeof(PL050KbdState),
|
||||||
|
.class_init = pl050_kbd_class_init,
|
||||||
};
|
};
|
||||||
|
|
||||||
static const TypeInfo pl050_mouse_info = {
|
static const TypeInfo pl050_mouse_info = {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue