diff options
| author | Aleksa Vuckovic <aleksav013@gmail.com> | 2022-11-26 00:22:10 +0100 |
|---|---|---|
| committer | Aleksa Vuckovic <aleksav013@gmail.com> | 2022-11-27 01:04:18 +0100 |
| commit | d43a3388a976a74ae109c5b8b5a31f82a16b45db (patch) | |
| tree | 51880414ee600ddfb3c7e3486c3d74beced36bfe /kernel/src/main.c | |
| parent | 5d56d1a5b4d52702eb4e4ea6f05e4b6eebf41ca8 (diff) | |
fixing issues
1) main.c: order of init (multiboot.c must be after heap & paging
because it uses heap to allocate pages for framebuffer)
2) paging.c: zeroing new pages allocated via heap
3) multiboot2.c: invalid pointer arithmetic
4) libk/string.c: check for null pointers in memcpy
5) paging: only page_lvl2 should have FLAG_HUGE
6) keyboard.c: kfree(print_buff)
Diffstat (limited to 'kernel/src/main.c')
| -rw-r--r-- | kernel/src/main.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/kernel/src/main.c b/kernel/src/main.c index 7424f56..ae2e0ee 100644 --- a/kernel/src/main.c +++ b/kernel/src/main.c @@ -5,6 +5,7 @@ #include <paging.h> #include <heap.h> #include <keyboard.h> +#include <libk/serial_stdio.h> #include <libk/stdio.h> #include <libk/string.h> #include <libk/math.h> @@ -20,16 +21,18 @@ int kernel_main(mb2_tag_header* multiboot_bootinfo, uint32_t multiboot_magic); int kernel_main(mb2_tag_header* multiboot_bootinfo, uint32_t multiboot_magic) { init_serial(); +// serial is enabled from this point init_gdt(); init_paging(); - init_timer(TICKS_PER_SECOND); - init_idt(); init_heap(); - init_tss(); read_mb2(multiboot_bootinfo, multiboot_magic); +// framebuffer is enabled from this point + init_timer(TICKS_PER_SECOND); + init_idt(); disc_init(); ext2_init(); ls(path_to_inode("/")); + init_tss(); jump_userspace(); for(;;) { |