From b11a2a876e7bd14078d26e12eab62db997a4dc76 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Tue, 14 Apr 2020 23:42:03 +0200
Subject: Switched to grub

This really isn't what I wanted because grub is very big and bloaty but
my own bootloader was very poorly written and I really want to implement
a filesystem like ext2 which wouldn't work with my own bootloader.
Furthermore this commit fixes many small issues including the one
occurring due to the statically linked user binary (I just removed
the linking for now).
---
 src/kernel/fs/load.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/kernel/fs/load.c')

diff --git a/src/kernel/fs/load.c b/src/kernel/fs/load.c
index b717e4f..49d31e1 100644
--- a/src/kernel/fs/load.c
+++ b/src/kernel/fs/load.c
@@ -13,8 +13,7 @@ void load_binaries()
 	userspace = (uint32_t)kmalloc(10000);
 	font = (struct font *)kmalloc(100000); // High quality shit
 
-	uint8_t boot_drive_id = (uint8_t)(*((uint8_t *)0x9000));
-	if (boot_drive_id != 0xE0) {
+	if (multiboot_header->boot_device != 0xE0FFFFFF) {
 		struct ata_interface *primary_master = new_ata(1, 0x1F0);
 		marfs_init(primary_master);
 		marfs_read_whole_file(4, (uint8_t *)userspace);
@@ -33,6 +32,11 @@ void load_binaries()
 			panic("Userspace binary not found!");
 		ATAPI_granular_read(1 + (user_e->length / 2048), user_e->lba, (uint8_t *)userspace);
 		kfree(user_e);
+
+		if (font->magic != 0xf0f0f0f0) {
+			serial_printf("0x%x: WRONG FONT MAGIC!", font->magic);
+			halt_loop();
+		}
 	}
 	vga_log("Successfully loaded binaries");
 }
\ No newline at end of file
-- 
cgit v1.2.3