os-k-team/os-k
os-k-team
/
os-k
2
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

from multiboot to kernel

This commit is contained in:
Adrien Bourmault 2019-03-08 21:56:01 +01:00
parent 8cf063d3bf
commit 815b2ac479
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot/loader/multiboot/header.inc
View File

@ -25,7 +25,7 @@
;; MULTIBOOT HEADER ;; MULTIBOOT HEADER
MB_AOUT_KLUDGE equ 0 << 16 ; if we are not an ELF executable 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_MEMINFO equ 1 << 1 ; Ask to provide memory map
MB_HEADER_MAGIC equ 0x1badb002 MB_HEADER_MAGIC equ 0x1badb002
MB_GRUB_MAGIC equ 0x2badb002 MB_GRUB_MAGIC equ 0x2badb002

4
boot/grub/include/multiboot.h → kaleid/include/multiboot/multiboot.h
View File

@ -245,7 +245,7 @@ struct multiboot_tag_mmap
multiboot_uint32_t size; multiboot_uint32_t size;
multiboot_uint32_t entry_size; multiboot_uint32_t entry_size;
multiboot_uint32_t entry_version; multiboot_uint32_t entry_version;
struct multiboot_mmap_entry entries[0]; struct multiboot_mmap_entry entries[0];
}; };
struct multiboot_vbe_info_block struct multiboot_vbe_info_block
@ -389,7 +389,7 @@ struct multiboot_tag_efi_mmap
multiboot_uint32_t descr_size; multiboot_uint32_t descr_size;
multiboot_uint32_t descr_vers; multiboot_uint32_t descr_vers;
multiboot_uint8_t efi_mmap[0]; multiboot_uint8_t efi_mmap[0];
}; };
struct multiboot_tag_efi32_ih struct multiboot_tag_efi32_ih
{ {

4
kaleid/kernel/init/init.c
View File

@ -21,14 +21,14 @@
// You should have received a copy of the GNU General Public License // // You should have received a copy of the GNU General Public License //
// along with OS/K. If not, see <https://www.gnu.org/licenses/>. // // along with OS/K. If not, see <https://www.gnu.org/licenses/>. //
//----------------------------------------------------------------------------// //----------------------------------------------------------------------------//
#include <multiboot/multiboot.h>
#include <kernel/term.h> #include <kernel/term.h>
#include <kernel/panic.h> #include <kernel/panic.h>
// //
// Entry point of the Kaleid kernel // 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 // We're not ready to deal with interrupts
DisableIRQs(); DisableIRQs();