3 files changed, 67 insertions, 2 deletions
diff --git a/src/input/input.h b/src/input/input.h
new file mode 100644
index 0000000..60d2f79
--- /dev/null
+++ b/src/input/input.h
@@ -0,0 +1,10 @@
+#ifndef MELVIX_INPUT_H
+#define MELVIX_INPUT_H
+
+void mouse_install();
+
+char get_mouse(int n);
+
+void keyboard_install();
+
+#endif
diff --git a/src/input/ps2/keyboard.c b/src/input/ps2/keyboard.c
new file mode 100644
index 0000000..bd8a4ba
--- /dev/null
+++ b/src/input/ps2/keyboard.c
@@ -0,0 +1,50 @@
+#include "../../interrupts/interrupts.h"
+#include "../../io/io.h"
+#include "../../graphics/vga.h"
+
+unsigned char keymap[128] = {
+        0 /*E*/, 27, '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=', '\b',
+        '\t', 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', '[', ']', '\n',
+        0 /*C*/, 'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', '\'', '`', 0 /*LS*/,
+        '\\', 'z', 'x', 'c', 'v', 'b', 'n', 'm', ',', '.', '/', 0 /*RS*/, '*',
+        0, // Alt key
+        ' ', // Space bar
+        0, // Caps lock
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // F keys
+        0, // Num lock
+        0, // Scroll lock
+        0, // Home key
+        0, // Up arrow
+        0, // Page up
+        '-',
+        0, // Left arrow
+        0,
+        0, // Right arrow
+        '+',
+        0, // End key
+        0, // Down arrow
+        0, // Page down
+        0, // Insert key
+        0, // Delete key
+        0, 0, 0,
+        0, // F11
+        0, // F12
+        0, // Other keys
+};
+
+void keyboard_handler(struct regs *r) {
+    unsigned char scan_code;
+
+    scan_code = receive(0x60);
+
+    if (scan_code & 0x80) {
+        // Release
+    } else {
+        terminal_put_char(keymap[scan_code]);
+    }
+}
+
+/* Installs the keyboard handler into IRQ1 */
+void keyboard_install() {
+    irq_install_handler(1, keyboard_handler);
+}
diff --git a/src/input/ps2/mouse.c b/src/input/ps2/mouse.c
index 5113c70..191c270 100644
--- a/src/input/ps2/mouse.c
+++ b/src/input/ps2/mouse.c
@@ -1,4 +1,7 @@
 #include "../../io/io.h"
+#include "../../interrupts/interrupts.h"
+#include "../../graphics/vga.h"
+#include "../input.h"
 
 char mouse_cycle = 0;
 signed char mouse_byte[3], mouse_ex[3];
@@ -8,7 +11,7 @@ int mouse_but_1 = 0;
 int mouse_but_2 = 0;
 int mm_n[3] = {0, 0, 0,};
 
-void mouse_handler(struct iregs *a_r) {
+void mouse_handler(struct regs *a_r) {
     switch (mouse_cycle) {
         case 0:
             mouse_byte[0] = receive(0x60);
@@ -32,6 +35,8 @@ void mouse_handler(struct iregs *a_r) {
             mouse_ex[2] = mouse_byte[2];
             mm_n[2] = 1;
             break;
+        default:
+            break;
     }
 }
 
@@ -92,7 +97,7 @@ void mouse_install() {
     mouse_read();
 
     // Setup the mouse handler
-    // irq_install_handler(12, mouse_handler);
+    irq_install_handler(2, mouse_handler);
 }