diff options
| author | Andreas Kling <awesomekling@gmail.com> | 2019-01-21 07:30:23 +0100 |
|---|---|---|
| committer | Andreas Kling <awesomekling@gmail.com> | 2019-01-21 07:30:46 +0100 |
| commit | f9fcb682ec76432090c6662a1dfae1720857d8d4 (patch) | |
| tree | cbe454c3dfd90e02f54c9fd122e81c8d4d69cc68 | |
| parent | 51595603bd2cb3fa44db92fa7a5d09d6fa2e33ef (diff) | |
| download | serenity-f9fcb682ec76432090c6662a1dfae1720857d8d4.zip | |
Keyboard: Use some of the existing defines instead of hard-coded numbers.
| -rw-r--r-- | Kernel/Keyboard.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/Kernel/Keyboard.cpp b/Kernel/Keyboard.cpp index 6181d00ed3..66c839df7c 100644 --- a/Kernel/Keyboard.cpp +++ b/Kernel/Keyboard.cpp @@ -7,18 +7,12 @@ #include <AK/Assertions.h> #define IRQ_KEYBOARD 1 - #define I8042_BUFFER 0x60 #define I8042_STATUS 0x64 - #define SET_LEDS 0xED #define DATA_AVAILABLE 0x01 #define I8042_ACK 0xFA -#define MOD_ALT 1 -#define MOD_CTRL 2 -#define MOD_SHIFT 4 - static char map[0x80] = { 0, 0, '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=', 0x08, 0, @@ -87,8 +81,8 @@ void Keyboard::key_state_changed(byte raw, bool pressed) void Keyboard::handle_irq() { - while (IO::in8(0x64) & 1) { - byte raw = IO::in8(0x60); + while (IO::in8(I8042_STATUS) & DATA_AVAILABLE) { + byte raw = IO::in8(I8042_BUFFER); byte ch = raw & 0x7f; bool pressed = !(raw & 0x80); @@ -96,9 +90,9 @@ void Keyboard::handle_irq() case 0x38: update_modifier(Mod_Alt, pressed); break; case 0x1d: update_modifier(Mod_Ctrl, pressed); break; case 0x2a: update_modifier(Mod_Shift, pressed); break; - case 0xfa: /* i8042 ack */ break; + case I8042_ACK: break; default: - if (m_modifiers & MOD_ALT) { + if (m_modifiers & Mod_Alt) { switch (map[ch]) { case '1': case '2': |