From 30601e14f216488ee3a36dc44ab0ed56da7ccdb2 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Sat, 25 Apr 2020 15:31:09 +0200
Subject: Working ext2 filereader

As soon as I implement indirect block pointers, the resources will
hopefully work again :)
---
 src/kernel/fs/load.c | 28 +++-------------------------
 1 file changed, 3 insertions(+), 25 deletions(-)

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

diff --git a/src/kernel/fs/load.c b/src/kernel/fs/load.c
index 9aca1c3..974c3fe 100644
--- a/src/kernel/fs/load.c
+++ b/src/kernel/fs/load.c
@@ -6,30 +6,8 @@
 
 void load_binaries()
 {
-	userspace = (uint32_t)kmalloc(10000);
-	font = (struct font *)kmalloc(100000); // High quality shit
+	//userspace = (uint32_t)read_file("/bin/user.bin");
+	font = (struct font *)read_file("/bin/font.bin");
 
-	/*if (multiboot_header->boot_device != 0xE0FFFFFF) {
-		panic("Unsupported boot drive!");
-	} else {
-		char *font_p[] = { "FONT.BIN" };
-		struct iso9660_entity *font_e = ISO9660_get(font_p, 1);
-		if (!font_e)
-			panic("Font not found!");
-		ATAPI_granular_read(1 + (font_e->length / 2048), font_e->lba, (uint8_t *)font);
-		kfree(font_e);
-
-		char *user_p[] = { "USER.BIN" };
-		struct iso9660_entity *user_e = ISO9660_get(user_p, 1);
-		if (!user_e)
-			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) {
-			warn("0x%x: WRONG FONT MAGIC!", font->magic);
-			halt_loop();
-		}
-	}*/
 	log("Successfully loaded binaries");
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3