git://scm.lunaixsky.com
/
lunaix-os.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Boot framework rework (#45)
[lunaix-os.git]
/
lunaix-os
/
arch
/
x86
/
boot
/
i386
/
init32.c
diff --git
a/lunaix-os/arch/x86/boot/i386/init32.c
b/lunaix-os/arch/x86/boot/i386/init32.c
index d9cc249485d5fa344d5ce76f0a51bc7292d6c381..0d0615f80c5877e5482b44571328fd663f0ab3fe 100644
(file)
--- a/
lunaix-os/arch/x86/boot/i386/init32.c
+++ b/
lunaix-os/arch/x86/boot/i386/init32.c
@@
-2,10
+2,12
@@
#include "sys/crx.h"
#include "sys/cpu.h"
#include "sys/crx.h"
#include "sys/cpu.h"
+ptr_t __multiboot_addr boot_data;
+
void boot_text
void boot_text
-x86_init(
struct multiboot_info*
mb)
+x86_init(
ptr_t
mb)
{
{
-
mb_parse(mb)
;
+
__multiboot_addr = mb
;
cr4_setfeature(CR4_OSXMMEXCPT | CR4_OSFXSR | CR4_PSE36);
cr4_setfeature(CR4_OSXMMEXCPT | CR4_OSFXSR | CR4_PSE36);