mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-24 18:32:28 -05:00
Code Issues Projects Releases Packages Wiki Activity

Keyboard: Use some of the existing defines instead of hard-coded numbers.

Browse source
This commit is contained in:
Andreas Kling 2019-01-21 07:30:23 +01:00
parent 51595603bd
commit f9fcb682ec
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Kernel/Keyboard.cpp
View file

@ -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':