diff options
| author | Marvin Borner | 2020-04-28 23:33:34 +0200 |
|---|---|---|
| committer | Marvin Borner | 2020-04-28 23:33:34 +0200 |
| commit | 34c752f6fe4f71169172f1b3e46b1eddf69eba6e (patch) | |
| tree | c9acf3f6cac1791861d3506c4fe6f2c1dfedeae5 /src/kernel/kernel.c | |
| parent | 5f8b5ce7efb7738eaebad43f9648975788ae19ff (diff) | |
Added support for multiple user applications
Diffstat (limited to 'src/kernel/kernel.c')
| -rw-r--r-- | src/kernel/kernel.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index 3efe193..90b967f 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -44,9 +44,8 @@ void kernel_main(uint32_t magic, uint32_t multiboot_address, uint32_t esp) isrs_install(); irq_install(); + // multiboot_parse(multiboot_address); // TODO: Why does this break graphics? paging_install(); - log("0x%x", multiboot_address); // TODO: Fix multiboot table mmap - multiboot_parse(multiboot_address); // Install drivers cli(); @@ -65,10 +64,10 @@ void kernel_main(uint32_t magic, uint32_t multiboot_address, uint32_t esp) load_binaries(); set_optimal_resolution(); - printf("%s", read_file("/etc/test")); + printf("Content of /etc/test: %s", read_file("/etc/test")); syscalls_install(); - struct process *proc = elf_load("/bin/sh"); + struct process *proc = elf_load("/bin/init"); if (proc) { proc->stdin = NULL; proc->stdout = NULL; @@ -76,7 +75,6 @@ void kernel_main(uint32_t magic, uint32_t multiboot_address, uint32_t esp) process_init(proc); } - log("Okidoko!"); halt_loop(); // asm ("div %0" :: "r"(0)); // Exception testing x/0 }
\ No newline at end of file |