summaryrefslogtreecommitdiff
path: root/src/kmain.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/kmain.c')
-rw-r--r--src/kmain.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/kmain.c b/src/kmain.c
index 07244bf..7501669 100644
--- a/src/kmain.c
+++ b/src/kmain.c
@@ -8,8 +8,8 @@
void kmain(struct boot_info *info) {
memory_init(&info->map);
- //acpi_init(info->acpi_table);
//fb_init(1024, 768);
+ //acpi_init(info->acpi_table);
kprintf("enterd kmain\n");
@@ -17,7 +17,7 @@ void kmain(struct boot_info *info) {
*(char *)(0xB8000 + 0x146) = 'i';
while (1) {
- //kprintf("ret: 0x%p\n", kalloc(1024));
+ __asm__("hlt;");
// loop so we dont halt
// this allows interrupts to fire
}