From 714e69d281e8b61d4214cea1c7e0a33a2f9cde71 Mon Sep 17 00:00:00 2001 From: Tianhao Wang Date: Thu, 30 May 2024 09:35:16 +0200 Subject: mm: fix Range type and addr rounding Signed-off-by: Tianhao Wang --- src/machine/multiboot.rs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/machine/multiboot.rs') diff --git a/src/machine/multiboot.rs b/src/machine/multiboot.rs index 303ed17..957f5de 100644 --- a/src/machine/multiboot.rs +++ b/src/machine/multiboot.rs @@ -1,7 +1,8 @@ -use crate::defs::Range; +// use crate::defs::Range; use crate::io::*; use core::fmt; use core::mem::size_of; +use core::ops::Range; use lazy_static::lazy_static; // provide functions to parse information provided by grub multiboot // see docs/multiboot.txt @@ -58,11 +59,11 @@ impl MultibootMmap { pub const MTYPE_RAM_NVS: u32 = 4; /// defective RAM pub const MTYPE_RAM_DEFECT: u32 = 5; - pub fn get_range(&self) -> Range { - return Range { - addr: self.addr, - len: self.len, - }; + pub fn get_range(&self) -> Range { + Range { + start: self.addr, + end: self.addr + self.len, + } } pub fn get_end(&self) -> u64 { return self.addr + self.len; -- cgit v1.2.3-70-g09d2