[PATCH] ps2: Remove stale check for timeout warning on reset
Commit 4ce5d207 removed the code to wait for a possible second byte from a keyboard reset command, but it did not remove the extra check when warning in ps2_recvbyte(). Remove the now stale code in ps2_recvbyte(). Signed-off-by: Kevin O'Connor <kevin@koconnor.net> --- src/hw/ps2port.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/hw/ps2port.c b/src/hw/ps2port.c index d5504f7..d9727d2 100644 --- a/src/hw/ps2port.c +++ b/src/hw/ps2port.c @@ -179,9 +179,7 @@ ps2_recvbyte(int aux, int needack, int timeout) } if (timer_check(end)) { - // Don't warn on second byte of a reset - if (timeout > 100) - warn_timeout(); + warn_timeout(); return -1; } yield(); -- 2.5.5
On Sun, Aug 14, 2016 at 10:10:54PM -0400, Kevin O'Connor wrote:
Commit 4ce5d207 removed the code to wait for a possible second byte from a keyboard reset command, but it did not remove the extra check when warning in ps2_recvbyte(). Remove the now stale code in ps2_recvbyte().
FYI, I committed this change. -Kevin
participants (1)
-
Kevin O'Connor