From 9a827eb5f6ff58bf801bc98bcb653876428ebe69 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Sat, 15 Aug 2020 18:02:49 +0200
Subject: Removed vesa from kernel

---
 kernel/features/proc.c | 4 ++--
 kernel/features/psf.c  | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'kernel/features')

diff --git a/kernel/features/proc.c b/kernel/features/proc.c
index 76ec16e..f59ff32 100644
--- a/kernel/features/proc.c
+++ b/kernel/features/proc.c
@@ -1,6 +1,7 @@
 // MIT License, Copyright (c) 2020 Marvin Borner
 
 #include <assert.h>
+#include <boot.h>
 #include <cpu.h>
 #include <interrupts.h>
 #include <load.h>
@@ -9,7 +10,6 @@
 #include <proc.h>
 #include <str.h>
 #include <timer.h>
-#include <vesa.h>
 
 u32 pid = 0;
 struct proc *root;
@@ -109,7 +109,7 @@ void proc_init()
 
 	_eip = root->regs.eip;
 	_esp = root->regs.esp;
-	((u32 *)_esp)[1] = (u32)vbe; // First argument
+	((u32 *)_esp)[1] = (u32)boot_passed->vbe; // First argument
 
 	proc_jump_userspace();
 }
diff --git a/kernel/features/psf.c b/kernel/features/psf.c
index adf2aa2..004ed8f 100644
--- a/kernel/features/psf.c
+++ b/kernel/features/psf.c
@@ -6,7 +6,6 @@
 #include <mem.h>
 #include <print.h>
 #include <psf.h>
-#include <vesa.h>
 
 // Verifies the PSF magics
 // Returns the PSF version or 0
-- 
cgit v1.2.3