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

Fix EasyDMA slice copying not actually copying data

Browse Source
This commit is contained in:
Til Blechschmidt 2022-02-23 23:38:18 +01:00
parent 6dc58645d2
commit 62407da29b
No known key found for this signature in database
GPG Key ID: 2F4E54D35C8390CB
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
embassy-nrf/src/spim.rs
View File

@ -8,6 +8,7 @@ use embassy::util::Unborrow;
use embassy_hal_common::unborrow; use embassy_hal_common::unborrow;
use futures::future::poll_fn; use futures::future::poll_fn;
use crate::chip::FORCE_COPY_BUFFER_SIZE;
use crate::gpio::sealed::Pin as _; use crate::gpio::sealed::Pin as _;
use crate::gpio::{self, AnyPin}; use crate::gpio::{self, AnyPin};
use crate::gpio::{Pin as GpioPin, PselBits}; use crate::gpio::{Pin as GpioPin, PselBits};
@ -273,8 +274,9 @@ impl<'d, T: Instance> Spim<'d, T> {
Ok(_) => Ok(()), Ok(_) => Ok(()),
Err(Error::DMABufferNotInDataMemory) => { Err(Error::DMABufferNotInDataMemory) => {
trace!("Copying SPIM tx buffer into RAM for DMA"); trace!("Copying SPIM tx buffer into RAM for DMA");
let tx_copied = tx.clone(); let mut tx_buf = [0u8; FORCE_COPY_BUFFER_SIZE];
self.blocking_inner_from_ram(rx, tx_copied) tx_buf[..tx.len()].copy_from_slice(tx);
self.blocking_inner_from_ram(rx, &tx_buf[..tx.len()])
} }
Err(error) => Err(error), Err(error) => Err(error),
} }
@ -304,8 +306,9 @@ impl<'d, T: Instance> Spim<'d, T> {
Ok(_) => Ok(()), Ok(_) => Ok(()),
Err(Error::DMABufferNotInDataMemory) => { Err(Error::DMABufferNotInDataMemory) => {
trace!("Copying SPIM tx buffer into RAM for DMA"); trace!("Copying SPIM tx buffer into RAM for DMA");
let tx_copied = tx.clone(); let mut tx_buf = [0u8; FORCE_COPY_BUFFER_SIZE];
self.async_inner_from_ram(rx, tx_copied).await tx_buf[..tx.len()].copy_from_slice(tx);
self.async_inner_from_ram(rx, &tx_buf[..tx.len()]).await
} }
Err(error) => Err(error), Err(error) => Err(error),
} }