Преглед на файлове

Merge pull request #50 from roblabla/memorymap-64bit

Return memory_map entries as u64, to support 32-bit targets
Isaac Woods преди 6 години
родител
ревизия
38af3a1fb5
променени са 2 файла, в които са добавени 5 реда и са изтрити 5 реда
  1. 1 1
      Cargo.toml
  2. 4 4
      src/memory_map.rs

+ 1 - 1
Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "multiboot2"
-version = "0.6.0"
+version = "0.7.0"
 authors = ["Philipp Oppermann <dev@phil-opp.com>", "Calvin Lee <cyrus296@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "An experimental Multiboot 2 crate for ELF-64/32 kernels."

+ 4 - 4
src/memory_map.rs

@@ -30,12 +30,12 @@ pub struct MemoryArea {
 }
 
 impl MemoryArea {
-    pub fn start_address(&self) -> usize {
-        self.base_addr as usize
+    pub fn start_address(&self) -> u64 {
+        self.base_addr
     }
 
-    pub fn end_address(&self) -> usize {
-        (self.base_addr + self.length) as usize
+    pub fn end_address(&self) -> u64 {
+        (self.base_addr + self.length)
     }
 
     pub fn size(&self) -> usize {