Alright!

6 files changed, 2 insertions, 50 deletions

diff --git a/kernel/inc/boot.h b/kernel/inc/boot.h
deleted file mode 100644
index 48ab440..0000000
--- a/kernel/inc/boot.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// MIT License, Copyright (c) 2020 Marvin Borner
-// This file specifies the structs passed by the bootloader
-
-#ifndef BOOT_H
-#define BOOT_H
-
-#include <def.h>
-
-struct vid_info {
-	u32 mode;
-	u32 *vbe;
-};
-
-enum mmap_type {
-	MEMORY_AVAILABLE = 1,
-	MEMORY_RESERVED,
-	MEMORY_ACPI,
-	MEMORY_NVS,
-	MEMORY_DEFECT,
-	MEMORY_DISABLED
-};
-
-struct mmap_boot {
-	u32 lbase;
-	u32 hbase;
-	u32 lsize;
-	u32 hsize;
-	u32 type;
-	u32 acpi;
-};
-
-struct mem_info {
-	struct mmap_boot *start;
-	u32 *end;
-	u32 size;
-};
-
-struct boot_info {
-	struct vid_info *vid;
-	struct mem_info *mem;
-	u32 tss;
-	u32 drive;
-};
-
-#endif
diff --git a/kernel/inc/fb.h b/kernel/inc/fb.h
index 46f9020..b3486e0 100644
--- a/kernel/inc/fb.h
+++ b/kernel/inc/fb.h
@@ -3,10 +3,8 @@
 #ifndef FB_H
 #define FB_H
 
-#include <boot.h>
 #include <mm.h>
 
-void fb_map_buffer(struct page_dir *dir, struct vid_info *boot) NONNULL;
 void fb_install(void) NONNULL;
 
 #endif
diff --git a/kernel/inc/gdt.h b/kernel/inc/gdt.h
index 06388a9..9a9fd01 100644
--- a/kernel/inc/gdt.h
+++ b/kernel/inc/gdt.h
@@ -54,7 +54,7 @@ struct tss_entry {
 	u16 iomap_base;
 } PACKED;
 
-void gdt_install(void);
+void gdt_install(u32 esp);
 void tss_set_stack(u32 ss, u32 esp);
 
 #endif
diff --git a/kernel/inc/io.h b/kernel/inc/io.h
index 5d51f89..b3e8b9b 100644
--- a/kernel/inc/io.h
+++ b/kernel/inc/io.h
@@ -3,7 +3,6 @@
 #ifndef IO_H
 #define IO_H
 
-#include <boot.h>
 #include <def.h>
 #include <interrupts.h>
 #include <proc.h>
diff --git a/kernel/inc/mm.h b/kernel/inc/mm.h
index a33d9d1..a8116e6 100644
--- a/kernel/inc/mm.h
+++ b/kernel/inc/mm.h
@@ -3,7 +3,6 @@
 #ifndef PAGING_H
 #define PAGING_H
 
-#include <boot.h>
 #include <def.h>
 #include <errno.h>
 #include <interrupts.h>
diff --git a/kernel/inc/multiboot.h b/kernel/inc/multiboot.h
index 839ade7..5227fb0 100644
--- a/kernel/inc/multiboot.h
+++ b/kernel/inc/multiboot.h
@@ -122,6 +122,7 @@ struct multiboot_mod_list {
 };
 
 void multiboot_mmap(void);
+u32 multiboot_vbe(void);
 void multiboot_init(u32 magic, u32 addr);
 
 #endif