From d98828d08eb1f6c1394f38a1df69c73fef0cfefa Mon Sep 17 00:00:00 2001 From: Michal Idziorek Date: Sun, 17 May 2015 19:43:59 +0200 Subject: working on vt52 and some cleanup --- kernel/kernel.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'kernel/kernel.c') diff --git a/kernel/kernel.c b/kernel/kernel.c index 0a4b863..de435c5 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -18,19 +18,17 @@ #include "interrupts.h" #include "multiboot.h" -#include "console.h" #include // for built-in shell #include "lib/buffer/ringbuffer.h" #include "task.h" -#include "video/vesa.h" +#include "video/console.h" #include "multiboot.h" #include "terminal/vt52.h" - // // The Foolish structure of Fool OS! // @@ -45,15 +43,26 @@ fool_os *get_fool() void kernel_main(uint32_t eax,uint32_t ebx) { - // - // Setup main tty + // Setup terminal output // - scr_clear(); - term_screen screen; + 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); get_fool()->tty1=&tty; + */ + // -- cgit v1.2.3