From 90a6065691beee52bf5309916fba98f7580d27be Mon Sep 17 00:00:00 2001
From: Freya Murphy <freya@freyacat.org>
Date: Sat, 3 Feb 2024 00:50:07 -0500
Subject: refactor, new arch dirs, (wip) page alloc on write, hsv screen
 (convert to userspace later), other fixes

---
 src/kmain.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'src/kmain.c')

diff --git a/src/kmain.c b/src/kmain.c
index 7ae9d01..249dd84 100644
--- a/src/kmain.c
+++ b/src/kmain.c
@@ -1,28 +1,27 @@
-#include "fpu.h"
+#include <fpu.h>
 #include <acpi.h>
 #include <memory.h>
 #include <lib.h>
-#include <fb.h>
+#include <serial.h>
 #include <shim.h>
 #include <panic.h>
 #include <pci.h>
+#include <screen.h>
 
 void kmain(struct boot_info *info) {
 	enable_fpu();
 	memory_init(&info->map);
 	pci_init();
-	fb_init(1024, 768);
-	//acpi_init(info->acpi_table);
+	screen_init();
+	acpi_init(info->acpi_table);
 
 	kprintf("enterd kmain\n");
 
-	*(char *)(0xB8000 + 0x144) = 'h';
-	*(char *)(0xB8000 + 0x146) = 'i';
+	char *test = kalloc(5);
+	*test = 1;
 
 
 	while (1) {
-		__asm__("hlt;");
-		// loop so we dont halt
-		// this allows interrupts to fire
+		screen_redraw();
 	}
 }
-- 
cgit v1.2.3-freya