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

Skip EasyDMA slice location check if slice is empty

Browse Source
This commit is contained in:
Til Blechschmidt 2022-02-23 22:51:01 +01:00
parent caad1111f9
commit ed9fad8c7e
No known key found for this signature in database
GPG Key ID: 2F4E54D35C8390CB
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
embassy-nrf/src/lib.rs
View File

@ -1,7 +1,7 @@
#![no_std] #![no_std]
#![cfg_attr( #![cfg_attr(
feature = "nightly", feature = "nightly",
feature(generic_associated_types, type_alias_impl_trait) feature(generic_associated_types, type_alias_impl_trait, slice_ptr_len)
)] )]
#[cfg(not(any( #[cfg(not(any(

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

@ -19,10 +19,10 @@ pub(crate) fn slice_in_ram<T>(slice: *const [T]) -> bool {
ptr >= SRAM_LOWER && (ptr + len * core::mem::size_of::<T>()) < SRAM_UPPER ptr >= SRAM_LOWER && (ptr + 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. Skips check if slice is zero-length.
#[cfg(not(feature = "nrf51"))] #[cfg(not(feature = "nrf51"))]
pub(crate) fn slice_in_ram_or<T, E>(slice: *const [T], err: E) -> Result<(), E> { pub(crate) fn slice_in_ram_or<T, E>(slice: *const [T], err: E) -> Result<(), E> {
if slice_in_ram(slice) { if slice.len() > 0 && slice_in_ram(slice) {
Ok(()) Ok(())
} else { } else {
Err(err) Err(err)