NuKVM/memtest86plus
3
0
Fork 0
mirror of https://github.com/memtest86plus/memtest86plus.git synced 2026-08-26 13:17:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix dead PS/2 KBs on AT-class 8042 controllers (ie: MSI MS-6167)

Browse Source 
Since e285fbb ('Ignore PS/2 mouse events') every scancode was discarded as a
mouse event: AT-class KB Controllers set status bit 5 as a transmit timeout,
not AUX data. Only honour the filter when the config byte enables AUX.
This commit is contained in:
Sam Demeulemeester
2026-08-02 18:09:47 +02:00
parent 3903f46c04
commit 1666ffd13d
1 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/keyboard.c
+21 -1
View File
@@ -13,6 +13,8 @@
#include "keyboard.h"
#include "config.h"
#include "unistd.h"
//------------------------------------------------------------------------------
// Private Constants
//------------------------------------------------------------------------------
@@ -223,10 +225,25 @@ static const char usb_hid_keymap[] = {
keyboard_types_t keyboard_types = KT_NONE;
// On AT-class 8042s status bit 5 is a transmit timeout flag, not AUX data.
static bool kbc_aux_enabled = true;
//------------------------------------------------------------------------------
// Private Functions
//------------------------------------------------------------------------------
// Check the 8042 config byte to see if the AUX (mouse) interface is enabled.
static void kbc_read_config(void)
{
int t;
for (t = 0; t < 1000 && (inb(0x64) & 0x02); t++) usleep(10); // wait for IBF clear
if (t == 1000) return;
outb(0x20, 0x64); // read the config byte
for (t = 0; t < 1000 && !(inb(0x64) & 0x01); t++) usleep(10);
if (t == 1000) return;
kbc_aux_enabled = !(inb(0x60) & 0x20);
}
// This function is called when an ESC O prefix has been detected.
static char get_vt220_sequence1(void)
{
@@ -369,6 +386,9 @@ void keyboard_init(void)
if (keyboard_types & KT_USB) {
find_usb_keyboards(keyboard_types == KT_USB);
}
if (keyboard_types & KT_LEGACY) {
kbc_read_config();
}
}
char get_key(void)
@@ -399,7 +419,7 @@ char get_key(void)
uint8_t status = inb(0x64);
if (status & 0x01) {
uint8_t c = inb(0x60);
if (status & 0x20) {
if ((status & 0x20) && kbc_aux_enabled) {
// Ignore mouse events.
return '\0';
}