michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-16 14:27:49 +00:00
Code Issues Projects Releases Wiki Activity

Add boot info argument and use entry_point macro

Browse Source
This commit is contained in:
Philipp Oppermann
2019-03-13 13:51:10 +01:00
parent 7b7d19592f
commit e1ec5159b8
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main.rs
View File

@@ -3,11 +3,13 @@
#![cfg_attr(test, allow(unused_imports))] #![cfg_attr(test, allow(unused_imports))]
use blog_os::println; use blog_os::println;
use bootloader::{entry_point, BootInfo};
use core::panic::PanicInfo; use core::panic::PanicInfo;
entry_point!(kernel_main);
#[cfg(not(test))] #[cfg(not(test))]
#[no_mangle] fn kernel_main(boot_info: &'static BootInfo) -> ! {
pub extern "C" fn _start() -> ! {
use blog_os::interrupts::PICS; use blog_os::interrupts::PICS;
use x86_64::registers::control::Cr3; use x86_64::registers::control::Cr3;