started big cleanup!

1 files changed, 11 insertions, 12 deletions

diff --git a/kernel/kernel.c b/kernel/kernel.c
index de435c5..098fc64 100644
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -40,28 +40,27 @@ fool_os *get_fool()
 }
 
 
+static void put_kb(uint8_t c)
+{
+    vt52_kb(get_fool()->tty1,c);
+}
+
 void kernel_main(uint32_t eax,uint32_t ebx)
 {
 
     //
-    // Setup terminal output
+    // Setup terminal output / input
     //
     term_out screen;
     screen.put_char=console_put_char;
     screen.update_cursor=update_cursor;
-    vt52_tty tty=vt52_init(&screen);
-    get_fool()->tty1=&tty;
 
-    //
-    // Setup terminal input
-    //
-    /*
-    term_in keyboard;
-    kb.get_char=console_put_char;
-    screen.update_cursor=update_cursor;
-    vt52_tty tty=vt52_init(&screen);
+    term_in input;
+
+    vt52_tty tty=vt52_init(&screen,&input);
     get_fool()->tty1=&tty;
-    */
+
+    keyboard_init(put_kb);