diff options
| author | dzwdz | 2022-04-21 19:17:29 +0200 |
|---|---|---|
| committer | dzwdz | 2022-04-21 19:17:29 +0200 |
| commit | a60b3ca993ac7ff428c4a545c357484237450c22 (patch) | |
| tree | d7d153e2ec6da67cc33be964ac9a65bacf03ee28 /src/kernel/main.c | |
| parent | a990307680233460b2243c84002725b05a68b94a (diff) | |
kernel: consolidate `process_seed` and `run_init`
Diffstat (limited to 'src/kernel/main.c')
| -rw-r--r-- | src/kernel/main.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/kernel/main.c b/src/kernel/main.c index d1046b2..a0fdd07 100644 --- a/src/kernel/main.c +++ b/src/kernel/main.c @@ -6,21 +6,6 @@ #include <kernel/util.h> #include <stdint.h> -_Noreturn static void run_init(struct kmain_info *info) { - // TODO move all of this to process_seed - struct process *proc = process_seed(); - void __user *init_base = (userptr_t)0x200000; - - // map the module as rw - for (uintptr_t off = 0; off < info->init.size; off += PAGE_SIZE) - pagedir_map(proc->pages, init_base + off, info->init.at + off, - true, true); - proc->regs.eip = init_base; - - kprintf("switching...\n"); - process_switch_any(); -} - void kmain(struct kmain_info info) { kprintf("mem...\n"); mem_init(&info); @@ -29,7 +14,10 @@ void kmain(struct kmain_info info) { tests_all(); kprintf("loading init...\n"); - run_init(&info); + process_seed(&info); + + kprintf("switching...\n"); + process_switch_any(); } void shutdown(void) { |