From c15925a24efe14f437d8a2699500241a58fdc8f9 Mon Sep 17 00:00:00 2001 From: Miguel Date: Fri, 17 Aug 2018 21:41:21 +0200 Subject: cleanup and working on fifo pipes --- kernel/kernel.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) (limited to 'kernel/kernel.c') diff --git a/kernel/kernel.c b/kernel/kernel.c index 2760e8b..fca6fe6 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -1,16 +1,12 @@ #define FOOLOS_MODULE_NAME "kernel" - -#ifdef __linux__ -#error "Watchout! this is not Linux but FoolOS. Use a cross-compiler" -#endif - #include "kernel.h" #include +#include + #include "config.h" #include "types.h" #include "lib/logger/log.h" - #include "fifo.h" #include "timer.h" #include "mem.h" @@ -19,27 +15,19 @@ #include "interrupts.h" #include "multiboot.h" #include "ringbuffer.h" - -#include - -// for built-in shell #include "task.h" #include "multiboot.h" - #include "terminal/terminal.h" #include "driver/screen.h" -// -// The Foolish structure of Fool OS! -// +// The Foolish structure of Fool OS! // static fool_os foolos; fool_os *get_fool() { return &foolos; } -// -// +// // stdio init : TODO: move away! static terminal_tty tty1; @@ -87,6 +75,8 @@ static void init_stdio() keyboard_init(put_kb); } + +/* F00L 0S Entry point (called directly from asm/multiboot.asm */ void kernel_main(uint32_t eax,uint32_t ebx) { // -- cgit v1.2.3