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

Refactor _from_ram methods to use more readable copy operation

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

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

@ -274,9 +274,9 @@ impl<'d, T: Instance> Spim<'d, T> {
Ok(_) => Ok(()),
Err(Error::DMABufferNotInDataMemory) => {
trace!("Copying SPIM tx buffer into RAM for DMA");
let mut tx_buf = [0u8; FORCE_COPY_BUFFER_SIZE];
tx_buf[..tx.len()].copy_from_slice(tx);
self.blocking_inner_from_ram(rx, &tx_buf[..tx.len()])
let tx_ram_buf = &mut [0; FORCE_COPY_BUFFER_SIZE][..tx.len()];
tx_ram_buf.copy_from_slice(tx);
self.blocking_inner_from_ram(rx, tx_ram_buf)
}
Err(error) => Err(error),
}
@ -306,9 +306,9 @@ impl<'d, T: Instance> Spim<'d, T> {
Ok(_) => Ok(()),
Err(Error::DMABufferNotInDataMemory) => {
trace!("Copying SPIM tx buffer into RAM for DMA");
let mut tx_buf = [0u8; FORCE_COPY_BUFFER_SIZE];
tx_buf[..tx.len()].copy_from_slice(tx);
self.async_inner_from_ram(rx, &tx_buf[..tx.len()]).await
let tx_ram_buf = &mut [0; FORCE_COPY_BUFFER_SIZE][..tx.len()];
tx_ram_buf.copy_from_slice(tx);
self.async_inner_from_ram(rx, tx_ram_buf).await
}
Err(error) => Err(error),
}

17
embassy-nrf/src/twim.rs
View File

@ -398,14 +398,9 @@ impl<'d, T: Instance> Twim<'d, T> {
Ok(_) => Ok(()),
Err(Error::DMABufferNotInDataMemory) => {
trace!("Copying TWIM tx buffer into RAM for DMA");
let mut tx_buf = [0u8; FORCE_COPY_BUFFER_SIZE];
tx_buf[..wr_buffer.len()].copy_from_slice(wr_buffer);
self.setup_write_read_from_ram(
address,
&tx_buf[..wr_buffer.len()],
rd_buffer,
inten,
)
let tx_ram_buf = &mut [0; FORCE_COPY_BUFFER_SIZE][..wr_buffer.len()];
tx_ram_buf.copy_from_slice(wr_buffer);
self.setup_write_read_from_ram(address, &tx_ram_buf, rd_buffer, inten)
}
Err(error) => Err(error),
}
@ -416,9 +411,9 @@ impl<'d, T: Instance> Twim<'d, T> {
Ok(_) => Ok(()),
Err(Error::DMABufferNotInDataMemory) => {
trace!("Copying TWIM tx buffer into RAM for DMA");
let mut tx_buf = [0u8; FORCE_COPY_BUFFER_SIZE];
tx_buf[..wr_buffer.len()].copy_from_slice(wr_buffer);
self.setup_write_from_ram(address, &tx_buf[..wr_buffer.len()], inten)
let tx_ram_buf = &mut [0; FORCE_COPY_BUFFER_SIZE][..wr_buffer.len()];
tx_ram_buf.copy_from_slice(wr_buffer);
self.setup_write_from_ram(address, &tx_ram_buf, inten)
}
Err(error) => Err(error),
}

12
embassy-nrf/src/uarte.rs
View File

@ -247,9 +247,9 @@ impl<'d, T: Instance> UarteTx<'d, T> {
Ok(_) => Ok(()),
Err(Error::DMABufferNotInDataMemory) => {
trace!("Copying UARTE tx buffer into RAM for DMA");
let mut tx_buf = [0u8; FORCE_COPY_BUFFER_SIZE];
tx_buf[..buffer.len()].copy_from_slice(buffer);
self.write_from_ram(&tx_buf[..buffer.len()]).await
let ram_buf = &mut [0; FORCE_COPY_BUFFER_SIZE][..buffer.len()];
ram_buf.copy_from_slice(buffer);
self.write_from_ram(&ram_buf).await
}
Err(error) => Err(error),
}
@ -314,9 +314,9 @@ impl<'d, T: Instance> UarteTx<'d, T> {
Ok(_) => Ok(()),
Err(Error::DMABufferNotInDataMemory) => {
trace!("Copying UARTE tx buffer into RAM for DMA");
let mut tx_buf = [0u8; FORCE_COPY_BUFFER_SIZE];
tx_buf[..buffer.len()].copy_from_slice(buffer);
self.blocking_write_from_ram(&tx_buf[..buffer.len()])
let ram_buf = &mut [0; FORCE_COPY_BUFFER_SIZE][..buffer.len()];
ram_buf.copy_from_slice(buffer);
self.blocking_write_from_ram(&ram_buf)
}
Err(error) => Err(error),
}