From 6e9b3275d75e0cdbae1e8f7e4dda8880bb6346bc Mon Sep 17 00:00:00 2001
From: Aleksa Vuckovic <aleksav013@gmail.com>
Date: Sat, 3 Sep 2022 23:53:53 +0200
Subject: gdt & tss

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

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

diff --git a/kernel/src/main.c b/kernel/src/main.c
index c575a0e..45d2eeb 100644
--- a/kernel/src/main.c
+++ b/kernel/src/main.c
@@ -11,27 +11,23 @@
 #include <disc.h>
 #include <ext2.h>
 #include <timer.h>
+#include <gdt.h>
+#include <userspace.h>
+#include <tss.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)
 {
+	init_gdt();
 	init_paging();
 	init_idt();
 	init_timer(TICKS_PER_SECOND);
 	init_heap();
 	read_mb2(multiboot_bootinfo, multiboot_magic);
-
-	// init disc
 	disc_init();
-
-	// read superblock
-	ext2_superblock = (ext2_superblock_t*)kalloc(sizeof(ext2_superblock_t));
-	read_superblock(ext2_superblock);
-
-	ls(path_to_inode("/"));
-
-	// free superblock
-	kfree(ext2_superblock);
+	ext2_init();
+//	ls(path_to_inode("/"));
+//	jump_userspace();
 
 	for(;;) {
 		__asm__ volatile ("hlt;");
-- 
cgit v1.2.3