diff options
| author | Miguel <m.i@gmx.at> | 2018-08-17 21:41:21 +0200 |
|---|---|---|
| committer | Miguel <m.i@gmx.at> | 2018-08-17 21:41:21 +0200 |
| commit | c15925a24efe14f437d8a2699500241a58fdc8f9 (patch) | |
| tree | c0db3a7d2a4f857324735df35e9cc1f0539c5f24 /kernel/kernel.c | |
| parent | 6fd78c2ff950310d8372ec0353553cc4a5a43e72 (diff) | |
cleanup and working on fifo pipes
Diffstat (limited to 'kernel/kernel.c')
| -rw-r--r-- | kernel/kernel.c | 22 |
1 files changed, 6 insertions, 16 deletions
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 <stdint.h> +#include <stddef.h> + #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 <stddef.h> - -// 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) { // |