summaryrefslogtreecommitdiff
path: root/kernel/kernel.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/kernel.c')
-rw-r--r--kernel/kernel.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c
index 67f1355..3bae34d 100644
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -1,5 +1,5 @@
-#define FOOLOS_MODULE_NAME "kernel"
-#include "kernel.h"
+#define FOOLOS_MODULE_NAME "dupa"
+#include "kernel/kernel.h"
#include <stdint.h>
@@ -13,7 +13,6 @@
#include "syscalls.h"
#include "types.h"
-#include "lib/logger/log.h"
#include "fifo.h"
#include "mem.h"
#include "vmem.h"
@@ -30,22 +29,21 @@ void kernel_main(uint32_t eax,uint32_t ebx)
{
serial_init();
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"%s - BUILD: git-%s (%s %s)",
- KERNEL_NAME,GIT_REVISION,__DATE__,__TIME__);
+ klog ("%s - BUILD: git-%s (%s %s)",KERNEL_NAME,GIT_REVISION,__DATE__,__TIME__);
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"COM 1 - initialized");
+ log(FOOLOS_MODULE_NAME,5,"COM 1 - initialized");
uint64_t epoch_time=timer_init();
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"PIT - initialized. %u seconds passed since 1970.",epoch_time);
+ log(FOOLOS_MODULE_NAME,5,"PIT - initialized. %u seconds passed since 1970.",epoch_time);
keyboard_init(0); //sstdin
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"Keyboard Initialized");
+ log(FOOLOS_MODULE_NAME,5,"Keyboard Initialized");
mouse_init();
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"Mouse Initialized");
+ log(FOOLOS_MODULE_NAME,5,"Mouse Initialized");
gdt_init();
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"GDT Initialized");
+ log(FOOLOS_MODULE_NAME,5,"GDT Initialized");
// MULTIBOOT HEADER
multiboot_information *info=get_multiboot(eax, ebx);