diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2020-05-21 13:32:22 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2020-05-21 13:38:27 -0400 |
| commit | 7e9db04923854b7f4edca33948f55abee22907b9 (patch) | |
| tree | 8a457c123bcd919550b4e9da6f93167cc8224358 /src/hw | |
| parent | d53aea02415d8eefb1063b65c3fff23d32150c8c (diff) | |
| download | seabios-hppa-7e9db04923854b7f4edca33948f55abee22907b9.zip seabios-hppa-7e9db04923854b7f4edca33948f55abee22907b9.tar.gz seabios-hppa-7e9db04923854b7f4edca33948f55abee22907b9.tar.bz2 | |
Revert "ps2port: adjust init routine to fix PS/2 keyboard issues"
It is believed that the underlying problem was fixed in commit
dbf9dd27f and therefore this commit is not necessary.
This reverts commit bfdb3f86e9116fc79ce63c231373b084aad11218.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'src/hw')
| -rw-r--r-- | src/hw/ps2port.c | 18 |
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); |