From 15f3911599a8d005edee46247470afe2a7a0b4aa Mon Sep 17 00:00:00 2001
From: Aleksa Vuckovic <aleksa@vuckovic.cc>
Date: Mon, 27 Feb 2023 01:59:33 +0100
Subject: almost done multitasking

---
 kernel/src/main.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'kernel/src/main.c')

diff --git a/kernel/src/main.c b/kernel/src/main.c
index 126c69e..d5e2492 100644
--- a/kernel/src/main.c
+++ b/kernel/src/main.c
@@ -23,6 +23,8 @@
 #include <ioapic.h>
 #include <atomic.h>
 #include <pmm.h>
+#include <scheduler.h>
+#include <process.h>
 
 int kernel_main(mb2_tag_header *multiboot_bootinfo, uint32_t multiboot_magic);
 int kernel_main(mb2_tag_header *multiboot_bootinfo, uint32_t multiboot_magic)
@@ -49,11 +51,14 @@ int kernel_main(mb2_tag_header *multiboot_bootinfo, uint32_t multiboot_magic)
 	parse_madt();
 	apic_remap_interrupts();
 	enable_interrupts();
-	init_ap_cpus();
-	jump_userspace();
+
+	init_scheduler();
+
+	/* init_ap_cpus(); */
+	/* jump_userspace(); */
 
 	for (;;) {
-		__asm__ __volatile__("hlt;");
+		__asm__ __volatile__("pause; hlt;");
 	}
 	return 0;
 }
-- 
cgit v1.2.3