summaryrefslogtreecommitdiff
path: root/kernel/kernel.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/kernel.c')
-rw-r--r--kernel/kernel.c23
1 files changed, 16 insertions, 7 deletions
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 <stddef.h>
// 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;
+ */
+
//