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

Use once crate to ensure that memory::init is only called once

Browse Source
This commit is contained in:
Philipp Oppermann
2017-11-19 13:19:17 +01:00
parent 76550dcd95
commit f2bbe43099
3 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@@ -13,3 +13,4 @@ spin = "0.4.5"
multiboot2 = "0.1.0" multiboot2 = "0.1.0"
bitflags = "0.7.0" bitflags = "0.7.0"
x86_64 = "0.1.2" x86_64 = "0.1.2"
once = "0.3.3"

2
src/lib.rs
View File

@@ -18,6 +18,8 @@ extern crate multiboot2;
#[macro_use] #[macro_use]
extern crate bitflags; extern crate bitflags;
extern crate x86_64; extern crate x86_64;
#[macro_use]
extern crate once;
#[macro_use] #[macro_use]
mod vga_buffer; mod vga_buffer;

2
src/memory/mod.rs
View File

@@ -11,6 +11,8 @@ pub const PAGE_SIZE: usize = 4096;
pub fn init(boot_info: &BootInformation) { pub fn init(boot_info: &BootInformation) {
assert_has_not_been_called!("memory::init must be called only once");
let memory_map_tag = boot_info.memory_map_tag().expect( let memory_map_tag = boot_info.memory_map_tag().expect(
"Memory map tag required"); "Memory map tag required");
let elf_sections_tag = boot_info.elf_sections_tag().expect( let elf_sections_tag = boot_info.elf_sections_tag().expect(