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

PAGE_SIZE is already defined in memory/mod.rs

Browse Source
This commit is contained in:
Philipp Oppermann
2015-12-07 10:55:20 +01:00
parent a279609c26
commit 6ed376112d
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/memory/paging/mod.rs
View File

@@ -1,5 +1,5 @@
use core::ptr::Unique;
use memory::{Frame, FrameAllocator};
use memory::{PAGE_SIZE, Frame, FrameAllocator};
use self::table::{Table, Level4};
use self::entry::*;
@@ -30,7 +30,6 @@ pub fn test<A>(frame_allocator: &mut A)
mapping::map(&Page::containing_address(0x0), PRESENT, frame_allocator);
}
pub const PAGE_SIZE: usize = 4096;
const ENTRY_COUNT: usize = 512;
pub type PhysicalAddress = usize;

4
src/memory/paging/translate.rs
View File

@@ -1,7 +1,7 @@
use super::{VirtualAddress, PhysicalAddress, Page, PAGE_SIZE, ENTRY_COUNT};
use super::{VirtualAddress, PhysicalAddress, Page, ENTRY_COUNT};
use super::table::P4;
use super::entry::HUGE_PAGE;
use memory::Frame;
use memory::{PAGE_SIZE, Frame};
pub fn translate(virtual_address: VirtualAddress) -> Option<PhysicalAddress> {
let offset = virtual_address % PAGE_SIZE;