max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix slice_in_ram for arbitrary size types

Browse Source
This commit is contained in:
Jacob Rosenthal 2021-11-03 18:56:02 -07:00
parent 64e1426b54
commit 03f2c593d6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
embassy-nrf/src/util.rs
View File

@ -4,13 +4,13 @@ const SRAM_UPPER: usize = 0x3000_0000;
/// Does this slice reside entirely within RAM? /// Does this slice reside entirely within RAM?
pub(crate) fn slice_in_ram<T>(slice: &[T]) -> bool { pub(crate) fn slice_in_ram<T>(slice: &[T]) -> bool {
let ptr = slice.as_ptr() as usize; let ptr = slice.as_ptr() as usize;
ptr >= SRAM_LOWER && (ptr + slice.len()) < SRAM_UPPER ptr >= SRAM_LOWER && (ptr + slice.len() * core::mem::size_of::<T>()) < SRAM_UPPER
} }
/// Return an error if slice is not in RAM. /// Return an error if slice is not in RAM.
#[cfg(not(feature = "nrf51"))] #[cfg(not(feature = "nrf51"))]
pub(crate) fn slice_in_ram_or<T, E>(slice: &[T], err: E) -> Result<(), E> { pub(crate) fn slice_in_ram_or<T, E>(slice: &[T], err: E) -> Result<(), E> {
if slice.len() == 0 || slice_in_ram(slice) { if slice.is_empty() || slice_in_ram(slice) {
Ok(()) Ok(())
} else { } else {
Err(err) Err(err)