mirror of
https://github.com/xemu-project/xemu.git
synced 2024-11-23 19:49:43 +00:00
pckbd: add i8042_reset() function to I8042 device
This means that it is no longer necessary to call qemu_register_reset() manually within i8042_realizefn(). Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Acked-by: Helge Deller <deller@gmx.de> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Message-Id: <20220624134109.881989-52-mark.cave-ayland@ilande.co.uk>
This commit is contained in:
parent
57de3c1d35
commit
55870d6f27
@ -808,6 +808,14 @@ static const MemoryRegionOps i8042_cmd_ops = {
|
||||
.endianness = DEVICE_LITTLE_ENDIAN,
|
||||
};
|
||||
|
||||
static void i8042_reset(DeviceState *dev)
|
||||
{
|
||||
ISAKBDState *s = I8042(dev);
|
||||
KBDState *ks = &s->kbd;
|
||||
|
||||
kbd_reset(ks);
|
||||
}
|
||||
|
||||
static void i8042_initfn(Object *obj)
|
||||
{
|
||||
ISAKBDState *isa_s = I8042(obj);
|
||||
@ -854,7 +862,6 @@ static void i8042_realizefn(DeviceState *dev, Error **errp)
|
||||
s->throttle_timer = timer_new_us(QEMU_CLOCK_VIRTUAL,
|
||||
kbd_throttle_timeout, s);
|
||||
}
|
||||
qemu_register_reset(kbd_reset, s);
|
||||
}
|
||||
|
||||
static void i8042_build_aml(AcpiDevAmlIf *adev, Aml *scope)
|
||||
@ -900,6 +907,7 @@ static void i8042_class_initfn(ObjectClass *klass, void *data)
|
||||
AcpiDevAmlIfClass *adevc = ACPI_DEV_AML_IF_CLASS(klass);
|
||||
|
||||
device_class_set_props(dc, i8042_properties);
|
||||
dc->reset = i8042_reset;
|
||||
dc->realize = i8042_realizefn;
|
||||
dc->vmsd = &vmstate_kbd_isa;
|
||||
adevc->build_dev_aml = i8042_build_aml;
|
||||
|
Loading…
Reference in New Issue
Block a user