marco/vulcanos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Trying to fix kheap...

Browse Source
This commit is contained in:
ice-bit
2019-09-26 17:45:46 +02:00
parent 8ff8d71af8
commit 3e0e8043d5
19 changed files with 383 additions and 701 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/kernel_main.c
View File

@@ -10,8 +10,6 @@
#include "drivers/idt.h"
#include "drivers/timer.h"
#include "drivers/keyboard.h"
#include "drivers/paging.h"
#include "drivers/kheap.h"
#include "shell/shell.h"
#include "libc/stdio.h"
@@ -37,7 +35,7 @@ void kernel_main() {
printf_color("\n[INFO]", LIGHT_CYAN, BLACK);
printf_color(" - Loaded PS/2 driver", WHITE, BLACK);
printf_color("\n[TEST]", LIGHT_BROWN, BLACK); // Testing heap
/* printf_color("\n[TEST]", LIGHT_BROWN, BLACK); // Testing heap
printf_color(" - Allocating heap blocks..\n", LIGHT_BROWN, BLACK);
uint32_t x = kmalloc(8), y = kmalloc(16), z = kmalloc(32);
@@ -48,7 +46,7 @@ void kernel_main() {
kfree((void*)x), kfree((void*)y), kfree((void*)z);
printf_color("\n[STATUS]", LIGHT_GREEN, BLACK);
printf_color(" - Heap worked successfullt!", WHITE, BLACK);
printf_color(" - Heap worked successfullt!", WHITE, BLACK); */
iceos_ascii_logo();
init_prompt(); // Initialize frame buffer