From 113e3079bfdec6c3ceee0626416cfef759b7fbe2 Mon Sep 17 00:00:00 2001 From: OBattler Date: Mon, 12 Mar 2018 00:32:33 +0100 Subject: [PATCH] The AMI non-PS/2 keyboard controller no longer uses bit 5 for keyboard mode, fixes CMOS Setup on the AMI WinBIOS 486. --- src/keyboard_at.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/keyboard_at.c b/src/keyboard_at.c index f2fe83b7f..15b7a5062 100644 --- a/src/keyboard_at.c +++ b/src/keyboard_at.c @@ -8,7 +8,7 @@ * * Intel 8042 (AT keyboard controller) emulation. * - * Version: @(#)keyboard_at.c 1.0.27 2018/03/02 + * Version: @(#)keyboard_at.c 1.0.28 2018/03/12 * * Authors: Sarah Walker, * Miran Grca, @@ -960,7 +960,7 @@ kbd_cmd_write(atkbd_t *kbd, uint8_t val) /* ISA AT keyboard controllers use bit 5 for keyboard mode (1 = PC/XT, 2 = AT); PS/2 (and EISA/PCI) keyboard controllers use it as the PS/2 mouse enable switch. */ - if ((kbd->flags & KBC_TYPE_MASK) >= KBC_TYPE_PS2_1) { + if (((kbd->flags & KBC_VEN_MASK) == KBC_VEN_AMI) || ((kbd->flags & KBC_TYPE_MASK) >= KBC_TYPE_PS2_1)) { keyboard_mode &= ~CCB_PCMODE; mouse_scan = !(val & 0x20);