diff options
| author | Miguel <m.i@gmx.at> | 2018-08-22 14:46:13 +0200 |
|---|---|---|
| committer | Miguel <m.i@gmx.at> | 2018-08-22 14:46:13 +0200 |
| commit | eddfc270d887283674563530b9fd982a2692f8c3 (patch) | |
| tree | cd6f0269bdb971e5921226d2594d303f2855ea98 | |
| parent | d99ddc6f38879fb30eaeb7dcafe25d1476613cb1 (diff) | |
cleaning up
| -rw-r--r-- | driver/serial.c | 2 | ||||
| -rw-r--r-- | kernel/kernel.h | 16 | ||||
| -rw-r--r-- | kernel/log.c (renamed from lib/logger/log.c) | 0 | ||||
| -rw-r--r-- | kernel/log.h (renamed from lib/logger/log.h) | 0 | ||||
| -rw-r--r-- | kernel/mem.c | 1 |
5 files changed, 4 insertions, 15 deletions
diff --git a/driver/serial.c b/driver/serial.c index 8747981..178c9bc 100644 --- a/driver/serial.c +++ b/driver/serial.c @@ -1,5 +1,5 @@ #define FOOLOS_MODULE_NAME "serial" -#include "serial.h" +#include "asm/serial.h" #include "asm/x86.h" // provides x86_inb() and x86_outb() diff --git a/kernel/kernel.h b/kernel/kernel.h index 5ac10d1..97be89c 100644 --- a/kernel/kernel.h +++ b/kernel/kernel.h @@ -5,28 +5,18 @@ #ifndef FOOLOS_CONFIG_H #define FOOLOS_CONFIG_H -#include "lib/logger/log.h" +#define KERNEL_NAME "F00l-Os" +#define BIN_INIT "/bin/init" -#define KERNEL_NAME "FoolOS" #define FIFO_MAX_RINGBUFFERS 20 #define MAX_FIFOS 20 #define MAX_FD 20 #define MAX_TASKS 255 - -#define FOOLOS_CONSOLE_AUTOBREAK // add newline automatically at end of line +#define MEM_PRINT_MEMORYMAP //#define FOOLOS_LOG_OFF // do not log anything -#define FOOLOS_LOG_WHITELIST "" //,"elf","ext2","" // make exceptions for these modules. wmpty string marks the end -#define FOOLOS_LOG_LEVEL FOOLOS_LOG_DEBUG // minimal severity level to log - -#define FOOLOS_CONSOLE // otherwise VESA will be used! -#define FOOLSOS_SHOW_VESAMODES -#define MEM_PRINT_MEMORYMAP -#define LOG_BUF_SIZE 4069 //#define LOG_SYSCALLS -#define BIN_INIT "/bin/init" - #define KMALLOC_MEM_SIZE 1024*1024*8 // 8MB for in kernel-memory #define NUMBER_SPINLOCKS 16 diff --git a/lib/logger/log.c b/kernel/log.c index ff1b8bf..ff1b8bf 100644 --- a/lib/logger/log.c +++ b/kernel/log.c diff --git a/lib/logger/log.h b/kernel/log.h index 38f1219..38f1219 100644 --- a/lib/logger/log.h +++ b/kernel/log.h diff --git a/kernel/mem.c b/kernel/mem.c index 8b90911..444e52b 100644 --- a/kernel/mem.c +++ b/kernel/mem.c @@ -4,7 +4,6 @@ #include "kernel.h" #include "multiboot.h" -#include "lib/logger/log.h" #define PMMNGR_BLOCKS_PER_BYTE 8 #define PMMNGR_BLOCK_SIZE 4096 |