nordic-dev.net/embassy
2
0
Fork 0
mirror of https://github.com/embassy-rs/embassy.git synced 2024-11-22 06:42:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

broaden tsize read support to other spi versions

Browse Source
This commit is contained in:
Alexandros Liarokapis 2024-05-27 20:42:29 +03:00
parent 76fbec74da
commit 1d05015a1c
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
embassy-stm32/src/spi/mod.rs
View File

@ -508,7 +508,7 @@ impl<'d> Spi<'d, Async> {
peri: impl Peripheral<P = T> + 'd, peri: impl Peripheral<P = T> + 'd,
sck: impl Peripheral<P = impl SckPin<T>> + 'd, sck: impl Peripheral<P = impl SckPin<T>> + 'd,
miso: impl Peripheral<P = impl MisoPin<T>> + 'd, miso: impl Peripheral<P = impl MisoPin<T>> + 'd,
#[cfg(not(spi_v3))] tx_dma: impl Peripheral<P = impl TxDma<T>> + 'd, #[cfg(any(spi_v1, spi_f1))] tx_dma: impl Peripheral<P = impl TxDma<T>> + 'd,
rx_dma: impl Peripheral<P = impl RxDma<T>> + 'd, rx_dma: impl Peripheral<P = impl RxDma<T>> + 'd,
config: Config, config: Config,
) -> Self { ) -> Self {
@ -517,9 +517,9 @@ impl<'d> Spi<'d, Async> {
new_pin!(sck, AFType::OutputPushPull, Speed::VeryHigh, config.sck_pull_mode()), new_pin!(sck, AFType::OutputPushPull, Speed::VeryHigh, config.sck_pull_mode()),
None, None,
new_pin!(miso, AFType::Input, Speed::VeryHigh), new_pin!(miso, AFType::Input, Speed::VeryHigh),
#[cfg(not(spi_v3))] #[cfg(any(spi_v1, spi_f1))]
new_dma!(tx_dma), new_dma!(tx_dma),
#[cfg(spi_v3)] #[cfg(any(spi_v2, spi_v3, spi_v4, spi_v5))]
None, None,
new_dma!(rx_dma), new_dma!(rx_dma),
config, config,
@ -626,19 +626,8 @@ impl<'d> Spi<'d, Async> {
} }
/// SPI read, using DMA. /// SPI read, using DMA.
#[cfg(any(spi_v2, spi_v3, spi_v4, spi_v5))]
pub async fn read<W: Word>(&mut self, data: &mut [W]) -> Result<(), Error> { pub async fn read<W: Word>(&mut self, data: &mut [W]) -> Result<(), Error> {
#[cfg(not(spi_v3))]
{
self.transmission_read(data).await
}
#[cfg(spi_v3)]
{
self.tsize_read(data).await
}
}
#[cfg(spi_v3)]
async fn tsize_read<W: Word>(&mut self, data: &mut [W]) -> Result<(), Error> {
if data.is_empty() { if data.is_empty() {
return Ok(()); return Ok(());
} }
@ -733,8 +722,9 @@ impl<'d> Spi<'d, Async> {
Ok(()) Ok(())
} }
#[cfg(not(spi_v3))] /// SPI read, using DMA.
async fn transmission_read<W: Word>(&mut self, data: &mut [W]) -> Result<(), Error> { #[cfg(any(spi_v1, spi_f1))]
pub async fn read<W: Word>(&mut self, data: &mut [W]) -> Result<(), Error> {
if data.is_empty() { if data.is_empty() {
return Ok(()); return Ok(());
} }