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

Use an import for initializing BootInfoFrameAllocator

Browse Source
This commit is contained in:
Philipp Oppermann
2019-04-30 12:59:23 +02:00
parent 24a9e7abd2
commit b5ee44621c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.rs
View File

@@ -11,14 +11,14 @@ use core::panic::PanicInfo;
entry_point!(kernel_main); entry_point!(kernel_main);
fn kernel_main(boot_info: &'static BootInfo) -> ! { fn kernel_main(boot_info: &'static BootInfo) -> ! {
use blog_os::memory; use blog_os::memory::{self, BootInfoFrameAllocator};
use x86_64::{structures::paging::Page, VirtAddr}; use x86_64::{structures::paging::Page, VirtAddr};
println!("Hello World{}", "!"); println!("Hello World{}", "!");
blog_os::init(); blog_os::init();
let mut mapper = unsafe { memory::init(boot_info.physical_memory_offset) }; let mut mapper = unsafe { memory::init(boot_info.physical_memory_offset) };
let mut frame_allocator = memory::BootInfoFrameAllocator::init(&boot_info.memory_map); let mut frame_allocator = BootInfoFrameAllocator::init(&boot_info.memory_map);
// map a previously unmapped page // map a previously unmapped page
let page = Page::containing_address(VirtAddr::new(0xdeadbeaf000)); let page = Page::containing_address(VirtAddr::new(0xdeadbeaf000));