Added keyboard stuff

Author: AvihooI

Makefile

@@ -16,7 +16,8 @@ ALL_OBJ := environment.o \
 		_idt.o \
 		irq.o \
 		_irq.o \
-		pit.o
+		pit.o \
+		kb.o
 ALL_DEP := $(patsubst %.o,.%.d,$(ALL_OBJ))
 
 #Assembly configuration

irq.c

@@ -2,6 +2,7 @@
 #include "irq.h"
 #include "idt.h"
 #include "io.h"
+#include "terminal.h"
 
 void *irq_handlers[16] = 
 {

kb.c

@@ -0,0 +1,65 @@
+
+#include "kb.h"
+#include "terminal.h"
+#include "irq.h"
+
+void init_kb()
+{
+    set_irq_handler(1, keyboard_handler);
+}
+
+unsigned char kbdus[128] =
+{
+    0,  27, '1', '2', '3', '4', '5', '6', '7', '8',	/* 9 */
+  '9', '0', '-', '=', '\b',	/* Backspace */
+  '\t',			/* Tab */
+  'q', 'w', 'e', 'r',	/* 19 */
+  't', 'y', 'u', 'i', 'o', 'p', '[', ']', '\n',	/* Enter key */
+    0,			/* 29   - Control */
+  'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';',	/* 39 */
+ '\'', '`',   0,		/* Left shift */
+ '\\', 'z', 'x', 'c', 'v', 'b', 'n',			/* 49 */
+  'm', ',', '.', '/',   0,				/* Right shift */
+  '*',
+    0,	/* Alt */
+  ' ',	/* Space bar */
+    0,	/* Caps lock */
+    0,	/* 59 - F1 key ... > */
+    0,   0,   0,   0,   0,   0,   0,   0,
+    0,	/* < ... F10 */
+    0,	/* 69 - Num lock*/
+    0,	/* Scroll Lock */
+    0,	/* Home key */
+    0,	/* Up Arrow */
+    0,	/* Page Up */
+  '-',
+    0,	/* Left Arrow */
+    0,
+    0,	/* Right Arrow */
+  '+',
+    0,	/* 79 - End key*/
+    0,	/* Down Arrow */
+    0,	/* Page Down */
+    0,	/* Insert Key */
+    0,	/* Delete Key */
+    0,   0,   0,
+    0,	/* F11 Key */
+    0,	/* F12 Key */
+    0,	/* All other keys are undefined */
+};
+
+void keyboard_handler(struct regs *r)
+{
+    byte scancode;
+    scancode = inb(0x60);
+
+    if (scancode & 0x80)
+    {
+
+    }
+    else
+    {
+        terminal_write_char(kbdus[scancode]);
+    }
+
+}

kb.h

@@ -0,0 +1,11 @@
+#ifndef __kb_h_
+#define __kb_h_
+
+#include "io.h"
+#include "types.h"
+
+void init_kb();
+
+void keyboard_handler(struct regs *r);
+
+#endif

kernel.c

@@ -22,7 +22,13 @@ void kernel_main()
 
     timer_wait(4);
 
-    terminal_write_str("Alright if we got all the way here!\n");
+    terminal_write_str("Setting up KB\n");
+
+    init_kb();
+
+    terminal_write_str("Write stuff!\n");
+
+    for(;;);
 
     return;
 }

pit.c

@@ -3,8 +3,9 @@
 #include "terminal.h"
 #include "irq.h"
 
-volatile dword timer_ticks = 0; //volatile extremely important since those values changed via interrupts
+volatile dword timer_ticks = 0; //volatile extremely important since those values change via interrupts
 volatile dword timer_seconds = 0;
+volatile byte waiting;
 
 void pit_set_timer_phase(word hz)
 {
@@ -19,7 +20,7 @@ void timer_handler(struct regs *r)
 {
     timer_ticks++;
 
-    if (timer_ticks % 18 == 0)
+    if (timer_ticks % 18 == 0 && waiting)
     {
         terminal_write_str("One second has passed!\n");
         timer_seconds++;
@@ -33,10 +34,13 @@ void init_pit()
 
 void timer_wait(dword seconds)
 {
+    waiting = 1;
     timer_seconds = 0;
 
     while (timer_seconds < seconds)
     {
         asm("nop"); //making sure the loop actually runs :)
     }
+
+    waiting = 0;
 }