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

hw/input/ps2: Convert TYPE_PS2_DEVICE to 3-phase reset

Browse Source 
Convert the parent class TYPE_PS2_DEVICE to 3-phase reset.  Note that
we need an 'exit' phase function as well as the usual 'hold' phase
function, because changing outbound IRQ line state is only permitted
in 'exit'.  (Strictly speaking it's not supposed to be done in a
legacy reset handler either, but you can often get away with it.)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20221109170009.3498451-2-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2022-11-09 17:00:08 +00:00
parent c3141e21e3
commit 2bb3f93037
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/input/ps2.c
View File

@ -1001,12 +1001,18 @@ void ps2_write_mouse(PS2MouseState *s, int val)
}
}
static void ps2_reset(DeviceState *dev)
static void ps2_reset_hold(Object *obj)
{
PS2State *s = PS2_DEVICE(dev);
PS2State *s = PS2_DEVICE(obj);
s->write_cmd = -1;
ps2_reset_queue(s);
}
static void ps2_reset_exit(Object *obj)
{
PS2State *s = PS2_DEVICE(obj);
ps2_lower_irq(s);
}
@ -1281,8 +1287,10 @@ static void ps2_init(Object *obj)
static void ps2_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
ResettableClass *rc = RESETTABLE_CLASS(klass);
dc->reset = ps2_reset;
rc->phases.hold = ps2_reset_hold;
rc->phases.exit = ps2_reset_exit;
set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
}