diff options
| author | Aleksa Vuckovic <aleksav013@gmail.com> | 2022-09-05 23:54:12 +0200 |
|---|---|---|
| committer | Aleksa Vuckovic <aleksav013@gmail.com> | 2022-09-07 17:46:10 +0200 |
| commit | 956bb743a3ba6939aaff2372fc45628cda6a9840 (patch) | |
| tree | 0d1fd304eb584c892e28e43bbc851cf66786d9da /kernel/src/main.c | |
| parent | 59f86fe8dd237e50c7fea03b506125e3abff0157 (diff) | |
userspace finally working
Diffstat (limited to 'kernel/src/main.c')
| -rw-r--r-- | kernel/src/main.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/kernel/src/main.c b/kernel/src/main.c index dce9c05..4b0d62a 100644 --- a/kernel/src/main.c +++ b/kernel/src/main.c @@ -22,14 +22,15 @@ int kernel_main(mb2_tag_header* multiboot_bootinfo, uint32_t multiboot_magic) init_serial(); init_gdt(); init_paging(); - init_idt(); init_timer(TICKS_PER_SECOND); + init_idt(); init_heap(); read_mb2(multiboot_bootinfo, multiboot_magic); - disc_init(); - ext2_init(); + init_tss(); +// disc_init(); +// ext2_init(); // ls(path_to_inode("/")); -// jump_userspace(); + jump_userspace(); for(;;) { __asm__ volatile ("hlt;"); |