From 815b2ac47909ad8676667f87057aac2517aaafca Mon Sep 17 00:00:00 2001
From: Adrien Bourmault <neox@os-k.eu>
Date: Fri, 8 Mar 2019 21:56:01 +0100
Subject: [PATCH] from multiboot to kernel

---
 boot/loader/multiboot/header.inc                            | 2 +-
 {boot/grub/include => kaleid/include/multiboot}/multiboot.h | 4 ++--
 kaleid/kernel/init/init.c                                   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename {boot/grub/include => kaleid/include/multiboot}/multiboot.h (99%)

diff --git a/boot/loader/multiboot/header.inc b/boot/loader/multiboot/header.inc
index be4e105..337d168 100644
--- a/boot/loader/multiboot/header.inc
+++ b/boot/loader/multiboot/header.inc
@@ -25,7 +25,7 @@
 
 ;; MULTIBOOT HEADER
 MB_AOUT_KLUDGE      equ 0 << 16     ; if we are not an ELF executable
-MB_ALIGN            equ 0 <<  0     ; Ask to align loaded modules on page boundaries
+MB_ALIGN            equ 1 <<  0     ; Ask to align loaded modules on page boundaries
 MB_MEMINFO          equ 1 <<  1     ; Ask to provide memory map
 MB_HEADER_MAGIC     equ 0x1badb002
 MB_GRUB_MAGIC       equ 0x2badb002
diff --git a/boot/grub/include/multiboot.h b/kaleid/include/multiboot/multiboot.h
similarity index 99%
rename from boot/grub/include/multiboot.h
rename to kaleid/include/multiboot/multiboot.h
index b181607..2c93a2a 100644
--- a/boot/grub/include/multiboot.h
+++ b/kaleid/include/multiboot/multiboot.h
@@ -245,7 +245,7 @@ struct multiboot_tag_mmap
   multiboot_uint32_t size;
   multiboot_uint32_t entry_size;
   multiboot_uint32_t entry_version;
-  struct multiboot_mmap_entry entries[0];  
+  struct multiboot_mmap_entry entries[0];
 };
 
 struct multiboot_vbe_info_block
@@ -389,7 +389,7 @@ struct multiboot_tag_efi_mmap
   multiboot_uint32_t descr_size;
   multiboot_uint32_t descr_vers;
   multiboot_uint8_t efi_mmap[0];
-}; 
+};
 
 struct multiboot_tag_efi32_ih
 {
diff --git a/kaleid/kernel/init/init.c b/kaleid/kernel/init/init.c
index c50108a..5dbbdcd 100644
--- a/kaleid/kernel/init/init.c
+++ b/kaleid/kernel/init/init.c
@@ -21,14 +21,14 @@
 //  You should have received a copy of the GNU General Public License         //
 //  along with OS/K.  If not, see <https://www.gnu.org/licenses/>.            //
 //----------------------------------------------------------------------------//
-
+#include <multiboot/multiboot.h>
 #include <kernel/term.h>
 #include <kernel/panic.h>
 
 //
 // Entry point of the Kaleid kernel
 //
-noreturn void StartKern(void* multibooot_info, int multiboot_magic)
+noreturn void StartKern(void* mbt, unsigned int mb_magic)
 {
     // We're not ready to deal with interrupts
     DisableIRQs();