diff options
| author | Marvin Borner | 2020-08-15 18:02:49 +0200 |
|---|---|---|
| committer | Marvin Borner | 2020-08-15 18:02:49 +0200 |
| commit | 9a827eb5f6ff58bf801bc98bcb653876428ebe69 (patch) | |
| tree | 6fd75fd29a2bd55fd4e1ebb7271176abb3936115 /kernel/features | |
| parent | 9f16b032d38613ca95e321e1d1e652c43129c68b (diff) | |
Removed vesa from kernel
Diffstat (limited to 'kernel/features')
| -rw-r--r-- | kernel/features/proc.c | 4 | ||||
| -rw-r--r-- | kernel/features/psf.c | 1 |
2 files changed, 2 insertions, 3 deletions
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 |