diff options
| author | Aleksa Vučković <aleksav013@gmail.com> | 2021-11-01 23:59:59 +0100 |
|---|---|---|
| committer | Aleksa Vučković <aleksav013@gmail.com> | 2021-11-01 23:59:59 +0100 |
| commit | 2a56405579be6dc341c503420e40cb30c5144a35 (patch) | |
| tree | 6548a001ead2a2df6068e2157a1b15adbe174aff /src/c/kernel.c | |
| parent | 89f7f1b114c1bbea3ad62808bf3653e1d2337d1f (diff) | |
Temporary heap fix
Diffstat (limited to 'src/c/kernel.c')
| -rw-r--r-- | src/c/kernel.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/c/kernel.c b/src/c/kernel.c index 48dbccb..a00c242 100644 --- a/src/c/kernel.c +++ b/src/c/kernel.c @@ -1,3 +1,4 @@ +#include"../include/stdio.h" #include"../include/heap.h" void terminal_initialize(void); @@ -9,13 +10,14 @@ void set_paging(); void kernel_main(void) { - terminal_initialize(); set_paging(); init_idt_table(); - init_keyboard(); init_timer(50); - //k_heapBMInit(&kheap); - //k_heapBMAddBlock(&kheap, 0x100000, 0x100000, 16); + init_keyboard(); + kheapinit(); + kheapaddblock(0x00200000, 0x00100000, 16); + + terminal_initialize(); prompt(); while(1) __asm__("hlt\n\t"); |
