summaryrefslogtreecommitdiff
path: root/kernel/multiboot.c
diff options
context:
space:
mode:
authorMiguel <m.i@gmx.at>2018-09-09 17:28:59 +0200
committerMiguel <m.i@gmx.at>2018-09-09 17:28:59 +0200
commit4cda542d863839c5b0e026ccee297ca5ff3dd9cd (patch)
tree7b8f7734f8f982df82b5c784386232e35a7ced44 /kernel/multiboot.c
parent9a4b35fd5a32490f8f15b48f978e7b1fbfdceb2a (diff)
switched to apic/ioapic finally
Diffstat (limited to 'kernel/multiboot.c')
-rw-r--r--kernel/multiboot.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/kernel/multiboot.c b/kernel/multiboot.c
index a705e81..ee84180 100644
--- a/kernel/multiboot.c
+++ b/kernel/multiboot.c
@@ -1,13 +1,11 @@
-#include "kernel/kernel.h"
-//https://www.gnu.org/software/grub/manual/multiboot/multiboot.html#Boot-information-format
-
+#include "kernel.h"
#include "multiboot.h"
-#include "driver/vesa.h"
-multiboot_information* get_multiboot(uint32_t eax, uint32_t ebx)
+multiboot_information* multiboot_read(uint32_t eax, uint32_t ebx)
{
-
if(eax!=0x2badb002)kpanic("EAX was not set properly by your bootlaoder!");
+ klog("multiboot struct at addr: 0x%08X",ebx);
+
multiboot_information *info;
info=ebx;
@@ -82,5 +80,4 @@ multiboot_information* get_multiboot(uint32_t eax, uint32_t ebx)
}
return info;
-
}