From e1ec5159b849eaf7068f40e39d70036b7e2fb270 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Wed, 13 Mar 2019 13:51:10 +0100 Subject: [PATCH] Add boot info argument and use entry_point macro --- src/main.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main.rs b/src/main.rs index c10b0954..98e3b337 100644 --- a/src/main.rs +++ b/src/main.rs @@ -3,11 +3,13 @@ #![cfg_attr(test, allow(unused_imports))] use blog_os::println; +use bootloader::{entry_point, BootInfo}; use core::panic::PanicInfo; +entry_point!(kernel_main); + #[cfg(not(test))] -#[no_mangle] -pub extern "C" fn _start() -> ! { +fn kernel_main(boot_info: &'static BootInfo) -> ! { use blog_os::interrupts::PICS; use x86_64::registers::control::Cr3;