aboutsummaryrefslogtreecommitdiff
path: root/src/hw
diff options
context:
space:
mode:
Diffstat (limited to 'src/hw')
-rw-r--r--src/hw/ps2port.c18
1 files changed, 5 insertions, 13 deletions
diff --git a/src/hw/ps2port.c b/src/hw/ps2port.c
index c82521b..9b099e8 100644
--- a/src/hw/ps2port.c
+++ b/src/hw/ps2port.c
@@ -465,14 +465,6 @@ ps2_keyboard_setup(void *data)
if (ret)
return;
- // Disable KB/mouse interfaces
- ret = i8042_command(I8042_CMD_KBD_DISABLE, NULL);
- if (ret)
- return;
- ret = i8042_command(I8042_CMD_AUX_DISABLE, NULL);
- if (ret)
- return;
-
// Controller self-test.
u8 param[2];
ret = i8042_command(I8042_CMD_CTL_TEST, param);
@@ -483,11 +475,6 @@ ps2_keyboard_setup(void *data)
return;
}
- // KB write CMD
- ret = i8042_command(I8042_CMD_CTL_WCTR, NULL);
- if (ret)
- return;
-
// Controller keyboard test.
ret = i8042_command(I8042_CMD_KBD_TEST, param);
if (ret)
@@ -518,6 +505,11 @@ ps2_keyboard_setup(void *data)
return;
}
+ /* Disable keyboard */
+ ret = ps2_kbd_command(ATKBD_CMD_RESET_DIS, NULL);
+ if (ret)
+ return;
+
// Set scancode command (mode 2)
param[0] = 0x02;
ret = ps2_kbd_command(ATKBD_CMD_SSCANSET, param);