aboutsummaryrefslogtreecommitdiff
path: root/src/kernel/kernel.c
diff options
context:
space:
mode:
authorMarvin Borner2020-02-22 17:22:17 +0100
committerMarvin Borner2020-02-22 17:22:17 +0100
commitadd6efeb22ffb7695d5c9addcef073fc653f700e (patch)
tree147c99f2f3e037c877a34468f1494c412ec53416 /src/kernel/kernel.c
parent86ef6a779a42cf5701632ccb82714a006bae4ee9 (diff)
Well basically nothing really works I guess
I've worked quite a while on several small things which I didn't commit but I'm going away for a week (holiday) soooo I synced these useless and dumb files :)
Diffstat (limited to 'src/kernel/kernel.c')
-rw-r--r--src/kernel/kernel.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c
index bd6fac1..ec98a88 100644
--- a/src/kernel/kernel.c
+++ b/src/kernel/kernel.c
@@ -12,6 +12,8 @@
#include <kernel/net/network.h>
#include <kernel/tasks/task.h>
#include <kernel/fs/load.h>
+#include <kernel/fs/elf.h>
+#include <kernel/lib/stdio.h>
void kernel_main(uint32_t initial_stack)
{
@@ -40,7 +42,7 @@ void kernel_main(uint32_t initial_stack)
network_install();
asm ("sti");
- tasking_install();
+ // tasking_install();
// Get hardware information
// get_smbios();
@@ -55,8 +57,12 @@ void kernel_main(uint32_t initial_stack)
install_melvix();
#endif
- syscalls_install();
- exec(userspace);
+ loader_init();
+ elf_init();
+ exec_start((uint8_t *) userspace);
+
+// syscalls_install();
+// exec(userspace);
panic("This should NOT happen!");