From 6a098a222b24da02d3fb35b8246848c9b127233a Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Fri, 7 Aug 2020 18:58:36 +0800 Subject: [PATCH] xous: Add missing `mem` functions Signed-off-by: Sean Cross --- xous-rs/src/arch/hosted/mem.rs | 41 ++++++++++++++++++++++++++++++++++ xous-rs/src/arch/native/mem.rs | 32 ++++++++++++++++++++++++++ 2 files changed, 73 insertions(+) create mode 100644 xous-rs/src/arch/hosted/mem.rs create mode 100644 xous-rs/src/arch/native/mem.rs diff --git a/xous-rs/src/arch/hosted/mem.rs b/xous-rs/src/arch/hosted/mem.rs new file mode 100644 index 000000000..bdb5a8520 --- /dev/null +++ b/xous-rs/src/arch/hosted/mem.rs @@ -0,0 +1,41 @@ +use crate::{Error, MemoryAddress, MemoryFlags, MemoryRange}; + +extern crate alloc; +use alloc::alloc::{alloc, dealloc, Layout}; + +pub fn map_memory_pre( + _phys: &Option, + _virt: &Option, + _size: usize, + _flags: MemoryFlags, +) -> core::result::Result<(), Error> { + Ok(()) +} + +pub fn map_memory_post( + _phys: Option, + _virt: Option, + _size: usize, + _flags: MemoryFlags, + mut range: MemoryRange, +) -> core::result::Result { + let layout = Layout::from_size_align(range.len(), 4096).unwrap(); + let new_mem = MemoryAddress::new(unsafe { alloc(layout) } as usize).ok_or(Error::BadAddress)?; + range.addr = new_mem; + Ok(range) +} + +pub fn unmap_memory_pre( + _range: &MemoryRange +) -> core::result::Result<(), Error> { + Ok(()) +} + +pub fn unmap_memory_post( + range: MemoryRange +) -> core::result::Result<(), Error> { + let layout = Layout::from_size_align(range.len(), 4096).unwrap(); + let ptr = range.as_mut_ptr(); + unsafe { dealloc(ptr, layout) }; + Ok(()) +} diff --git a/xous-rs/src/arch/native/mem.rs b/xous-rs/src/arch/native/mem.rs new file mode 100644 index 000000000..f1b0a1d38 --- /dev/null +++ b/xous-rs/src/arch/native/mem.rs @@ -0,0 +1,32 @@ +use crate::{Error, MemoryAddress, MemoryFlags, MemoryRange}; + +pub fn map_memory_pre( + _phys: &Option, + _virt: &Option, + _size: usize, + _flags: MemoryFlags, +) -> core::result::Result<(), Error> { + Ok(()) +} + +pub fn map_memory_post( + _phys: Option, + _virt: Option, + _size: usize, + _flags: MemoryFlags, + range: MemoryRange, +) -> core::result::Result { + Ok(range) +} + +pub fn unmap_memory_pre( + _range: &MemoryRange +) -> core::result::Result<(), Error> { + Ok(()) +} + +pub fn unmap_memory_post( + _range: MemoryRange +) -> core::result::Result<(), Error> { + Ok(()) +}