From 5250afa00f8f10fa10994be6aea50cfb2dbae587 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Tue, 25 Feb 2025 18:27:03 +0300 Subject: [PATCH] ps2: Restart timer when starting configuration writes Main timeout may be expired e.g. due to mouse config problem yet we still need to configure interrupts. Hence start a new timer --- drivers/ps2.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/ps2.cpp b/drivers/ps2.cpp index 8fe5960..1a9a7d2 100644 --- a/drivers/ps2.cpp +++ b/drivers/ps2.cpp @@ -566,12 +566,14 @@ void PS2::Initialise(KDevice *parentDevice) { } { + // Normal timeout may be exhausted, start a new one + KTimeout irqTimeout(1000); WaitInputBuffer(); ProcessorOut8(IO_PS2_COMMAND, PS2_READ_CONFIG); - uint8_t configurationByte = ReadByte(&timeout); + uint8_t configurationByte = ReadByte(&irqTimeout); WaitInputBuffer(); ProcessorOut8(IO_PS2_COMMAND, PS2_WRITE_CONFIG); - WriteByte(&timeout, configurationByte | PS2_FIRST_IRQ_MASK | PS2_SECOND_IRQ_MASK); + WriteByte(&irqTimeout, configurationByte | PS2_FIRST_IRQ_MASK | PS2_SECOND_IRQ_MASK); } if (!registeredIRQs) {