From d426caefbfdc7ea4395df9007d786d3efc37eb88 Mon Sep 17 00:00:00 2001 From: Grant Miller Date: Mon, 6 Dec 2021 14:02:21 -0600 Subject: [PATCH 01/10] Move NoPin impls from v1 to mod --- embassy-stm32/src/spi/mod.rs | 22 +++++++++++++++++++++- embassy-stm32/src/spi/v1.rs | 22 +--------------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/embassy-stm32/src/spi/mod.rs b/embassy-stm32/src/spi/mod.rs index e881a5235..8668f6344 100644 --- a/embassy-stm32/src/spi/mod.rs +++ b/embassy-stm32/src/spi/mod.rs @@ -8,7 +8,7 @@ mod _version; use crate::{dma, peripherals, rcc::RccPeripheral}; pub use _version::*; -use crate::gpio::OptionalPin; +use crate::gpio::{NoPin, OptionalPin}; #[derive(Debug)] #[cfg_attr(feature = "defmt", derive(defmt::Format))] @@ -135,6 +135,26 @@ crate::pac::peripheral_pins!( }; ); +macro_rules! impl_nopin { + ($inst:ident, $signal:ident) => { + impl $signal for NoPin {} + + impl sealed::$signal for NoPin { + fn af_num(&self) -> u8 { + 0 + } + } + }; +} + +crate::pac::peripherals!( + (spi, $inst:ident) => { + impl_nopin!($inst, SckPin); + impl_nopin!($inst, MosiPin); + impl_nopin!($inst, MisoPin); + }; +); + macro_rules! impl_dma { ($inst:ident, {dmamux: $dmamux:ident}, $signal:ident, $request:expr) => { impl sealed::$signal for T diff --git a/embassy-stm32/src/spi/v1.rs b/embassy-stm32/src/spi/v1.rs index b727f2008..9ad9397a4 100644 --- a/embassy-stm32/src/spi/v1.rs +++ b/embassy-stm32/src/spi/v1.rs @@ -3,9 +3,8 @@ use crate::dma::NoDma; use crate::gpio::sealed::AFType; use crate::gpio::sealed::Pin; -use crate::gpio::{AnyPin, NoPin}; +use crate::gpio::AnyPin; use crate::pac::spi; -use crate::peripherals; use crate::spi::{ ByteOrder, Config, Error, Instance, MisoPin, MosiPin, RxDmaChannel, SckPin, TxDmaChannel, WordSize, @@ -30,25 +29,6 @@ impl WordSize { } } -macro_rules! impl_nopin { - ($inst:ident, $signal:ident) => { - impl $signal for NoPin {} - - impl super::sealed::$signal for NoPin { - fn af_num(&self) -> u8 { - 0 - } - } - }; -} -crate::pac::peripherals!( - (spi, $inst:ident) => { - impl_nopin!($inst, SckPin); - impl_nopin!($inst, MosiPin); - impl_nopin!($inst, MisoPin); - }; -); - pub struct Spi<'d, T: Instance, Tx, Rx> { sck: Option, mosi: Option, From d51885c0eb5bc0d46db49c7ffd8f58128e5c983e Mon Sep 17 00:00:00 2001 From: Grant Miller Date: Mon, 6 Dec 2021 14:13:25 -0600 Subject: [PATCH 02/10] Move WordSize methods to mod --- embassy-stm32/src/spi/mod.rs | 43 ++++++++++++++++++++++++++++++++++++ embassy-stm32/src/spi/v1.rs | 9 -------- embassy-stm32/src/spi/v2.rs | 16 -------------- embassy-stm32/src/spi/v3.rs | 16 -------------- 4 files changed, 43 insertions(+), 41 deletions(-) diff --git a/embassy-stm32/src/spi/mod.rs b/embassy-stm32/src/spi/mod.rs index 8668f6344..a0bb66eb0 100644 --- a/embassy-stm32/src/spi/mod.rs +++ b/embassy-stm32/src/spi/mod.rs @@ -5,6 +5,7 @@ #[cfg_attr(spi_v2, path = "v2.rs")] #[cfg_attr(spi_v3, path = "v3.rs")] mod _version; +use crate::pac::spi::vals; use crate::{dma, peripherals, rcc::RccPeripheral}; pub use _version::*; @@ -31,6 +32,48 @@ enum WordSize { SixteenBit, } +impl WordSize { + #[cfg(any(spi_v1, spi_f1))] + fn dff(&self) -> vals::Dff { + match self { + WordSize::EightBit => vals::Dff::EIGHTBIT, + WordSize::SixteenBit => vals::Dff::SIXTEENBIT, + } + } + + #[cfg(spi_v2)] + fn ds(&self) -> vals::Ds { + match self { + WordSize::EightBit => vals::Ds::EIGHTBIT, + WordSize::SixteenBit => vals::Ds::SIXTEENBIT, + } + } + + #[cfg(spi_v2)] + fn frxth(&self) -> vals::Frxth { + match self { + WordSize::EightBit => vals::Frxth::QUARTER, + WordSize::SixteenBit => vals::Frxth::HALF, + } + } + + #[cfg(spi_v3)] + fn dsize(&self) -> u8 { + match self { + WordSize::EightBit => 0b0111, + WordSize::SixteenBit => 0b1111, + } + } + + #[cfg(spi_v3)] + fn _frxth(&self) -> vals::Fthlv { + match self { + WordSize::EightBit => vals::Fthlv::ONEFRAME, + WordSize::SixteenBit => vals::Fthlv::ONEFRAME, + } + } +} + #[non_exhaustive] pub struct Config { pub mode: Mode, diff --git a/embassy-stm32/src/spi/v1.rs b/embassy-stm32/src/spi/v1.rs index 9ad9397a4..08bee758b 100644 --- a/embassy-stm32/src/spi/v1.rs +++ b/embassy-stm32/src/spi/v1.rs @@ -20,15 +20,6 @@ pub use embedded_hal::blocking; pub use embedded_hal::spi::{Mode, Phase, Polarity, MODE_0, MODE_1, MODE_2, MODE_3}; use futures::future::join3; -impl WordSize { - fn dff(&self) -> spi::vals::Dff { - match self { - WordSize::EightBit => spi::vals::Dff::EIGHTBIT, - WordSize::SixteenBit => spi::vals::Dff::SIXTEENBIT, - } - } -} - pub struct Spi<'d, T: Instance, Tx, Rx> { sck: Option, mosi: Option, diff --git a/embassy-stm32/src/spi/v2.rs b/embassy-stm32/src/spi/v2.rs index aa04fcca4..b281c7548 100644 --- a/embassy-stm32/src/spi/v2.rs +++ b/embassy-stm32/src/spi/v2.rs @@ -18,22 +18,6 @@ use embassy_traits::spi as traits; pub use embedded_hal::spi::{Mode, Phase, Polarity, MODE_0, MODE_1, MODE_2, MODE_3}; use futures::future::{join, join3}; -impl WordSize { - fn ds(&self) -> spi::vals::Ds { - match self { - WordSize::EightBit => spi::vals::Ds::EIGHTBIT, - WordSize::SixteenBit => spi::vals::Ds::SIXTEENBIT, - } - } - - fn frxth(&self) -> spi::vals::Frxth { - match self { - WordSize::EightBit => spi::vals::Frxth::QUARTER, - WordSize::SixteenBit => spi::vals::Frxth::HALF, - } - } -} - pub struct Spi<'d, T: Instance, Tx, Rx> { sck: Option, mosi: Option, diff --git a/embassy-stm32/src/spi/v3.rs b/embassy-stm32/src/spi/v3.rs index dbd9d78c9..cd88acb7a 100644 --- a/embassy-stm32/src/spi/v3.rs +++ b/embassy-stm32/src/spi/v3.rs @@ -19,22 +19,6 @@ pub use embedded_hal::spi::{Mode, Phase, Polarity, MODE_0, MODE_1, MODE_2, MODE_ use futures::future::join3; -impl WordSize { - fn dsize(&self) -> u8 { - match self { - WordSize::EightBit => 0b0111, - WordSize::SixteenBit => 0b1111, - } - } - - fn _frxth(&self) -> spi::vals::Fthlv { - match self { - WordSize::EightBit => spi::vals::Fthlv::ONEFRAME, - WordSize::SixteenBit => spi::vals::Fthlv::ONEFRAME, - } - } -} - #[allow(unused)] pub struct Spi<'d, T: Instance, Tx = NoDma, Rx = NoDma> { sck: Option, From aeb69a76651b2a06cc74b15ee926a0797a3536f4 Mon Sep 17 00:00:00 2001 From: Grant Miller Date: Mon, 6 Dec 2021 14:24:02 -0600 Subject: [PATCH 03/10] Track current word size in v2 and v3 also --- embassy-stm32/src/spi/v1.rs | 2 +- embassy-stm32/src/spi/v2.rs | 22 ++++++++++++++-------- embassy-stm32/src/spi/v3.rs | 22 ++++++++++++++-------- 3 files changed, 29 insertions(+), 17 deletions(-) diff --git a/embassy-stm32/src/spi/v1.rs b/embassy-stm32/src/spi/v1.rs index 08bee758b..a41c79913 100644 --- a/embassy-stm32/src/spi/v1.rs +++ b/embassy-stm32/src/spi/v1.rs @@ -140,8 +140,8 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { T::regs().cr1().modify(|reg| { reg.set_spe(true); }); - self.current_word_size = word_size; } + self.current_word_size = word_size; } #[allow(unused)] diff --git a/embassy-stm32/src/spi/v2.rs b/embassy-stm32/src/spi/v2.rs index b281c7548..0c0d24ce9 100644 --- a/embassy-stm32/src/spi/v2.rs +++ b/embassy-stm32/src/spi/v2.rs @@ -24,6 +24,7 @@ pub struct Spi<'d, T: Instance, Tx, Rx> { miso: Option, txdma: Tx, rxdma: Rx, + current_word_size: WordSize, phantom: PhantomData<&'d mut T>, } @@ -107,6 +108,7 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { miso, txdma, rxdma, + current_word_size: WordSize::EightBit, phantom: PhantomData, } } @@ -125,7 +127,10 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { } } - fn set_word_size(word_size: WordSize) { + fn set_word_size(&mut self, word_size: WordSize) { + if self.current_word_size == word_size { + return; + } unsafe { T::regs().cr1().modify(|w| { w.set_spe(false); @@ -138,6 +143,7 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { w.set_spe(true); }); } + self.current_word_size = word_size; } #[allow(unused)] @@ -150,7 +156,7 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { w.set_spe(false); }); } - Self::set_word_size(WordSize::EightBit); + self.set_word_size(WordSize::EightBit); let request = self.txdma.request(); let dst = T::regs().dr().ptr() as *mut u8; @@ -192,7 +198,7 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { reg.set_rxdmaen(true); }); } - Self::set_word_size(WordSize::EightBit); + self.set_word_size(WordSize::EightBit); let clock_byte_count = read.len(); @@ -252,7 +258,7 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { let _ = T::regs().dr().read(); } } - Self::set_word_size(WordSize::EightBit); + self.set_word_size(WordSize::EightBit); let rx_request = self.rxdma.request(); let rx_src = T::regs().dr().ptr() as *mut u8; @@ -365,7 +371,7 @@ impl<'d, T: Instance, Rx> embedded_hal::blocking::spi::Write for Spi<'d, T, type Error = Error; fn write(&mut self, words: &[u8]) -> Result<(), Self::Error> { - Self::set_word_size(WordSize::EightBit); + self.set_word_size(WordSize::EightBit); let regs = T::regs(); for word in words.iter() { @@ -381,7 +387,7 @@ impl<'d, T: Instance> embedded_hal::blocking::spi::Transfer for Spi<'d, T, N type Error = Error; fn transfer<'w>(&mut self, words: &'w mut [u8]) -> Result<&'w [u8], Self::Error> { - Self::set_word_size(WordSize::EightBit); + self.set_word_size(WordSize::EightBit); let regs = T::regs(); for word in words.iter_mut() { @@ -397,7 +403,7 @@ impl<'d, T: Instance, Rx> embedded_hal::blocking::spi::Write for Spi<'d, T, type Error = Error; fn write(&mut self, words: &[u16]) -> Result<(), Self::Error> { - Self::set_word_size(WordSize::SixteenBit); + self.set_word_size(WordSize::SixteenBit); let regs = T::regs(); for word in words.iter() { @@ -413,7 +419,7 @@ impl<'d, T: Instance> embedded_hal::blocking::spi::Transfer for Spi<'d, T, type Error = Error; fn transfer<'w>(&mut self, words: &'w mut [u16]) -> Result<&'w [u16], Self::Error> { - Self::set_word_size(WordSize::SixteenBit); + self.set_word_size(WordSize::SixteenBit); let regs = T::regs(); for word in words.iter_mut() { diff --git a/embassy-stm32/src/spi/v3.rs b/embassy-stm32/src/spi/v3.rs index cd88acb7a..e2751ce20 100644 --- a/embassy-stm32/src/spi/v3.rs +++ b/embassy-stm32/src/spi/v3.rs @@ -26,6 +26,7 @@ pub struct Spi<'d, T: Instance, Tx = NoDma, Rx = NoDma> { miso: Option, txdma: Tx, rxdma: Rx, + current_word_size: WordSize, phantom: PhantomData<&'d mut T>, } @@ -120,6 +121,7 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { miso, txdma, rxdma, + current_word_size: WordSize::EightBit, phantom: PhantomData, } } @@ -138,7 +140,10 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { } } - fn set_word_size(word_size: WordSize) { + fn set_word_size(&mut self, word_size: WordSize) { + if self.current_word_size == word_size { + return; + } unsafe { T::regs().cr1().modify(|w| { w.set_csusp(true); @@ -155,6 +160,7 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { w.set_spe(true); }); } + self.current_word_size = word_size; } #[allow(unused)] @@ -162,7 +168,7 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { where Tx: TxDmaChannel, { - Self::set_word_size(WordSize::EightBit); + self.set_word_size(WordSize::EightBit); unsafe { T::regs().cr1().modify(|w| { w.set_spe(false); @@ -204,7 +210,7 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { Tx: TxDmaChannel, Rx: RxDmaChannel, { - Self::set_word_size(WordSize::EightBit); + self.set_word_size(WordSize::EightBit); unsafe { T::regs().cr1().modify(|w| { w.set_spe(false); @@ -260,7 +266,7 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { { assert!(read.len() >= write.len()); - Self::set_word_size(WordSize::EightBit); + self.set_word_size(WordSize::EightBit); unsafe { T::regs().cr1().modify(|w| { w.set_spe(false); @@ -336,7 +342,7 @@ impl<'d, T: Instance> embedded_hal::blocking::spi::Write for Spi<'d, T, NoDm type Error = Error; fn write(&mut self, words: &[u8]) -> Result<(), Self::Error> { - Self::set_word_size(WordSize::EightBit); + self.set_word_size(WordSize::EightBit); let regs = T::regs(); for word in words.iter() { @@ -384,7 +390,7 @@ impl<'d, T: Instance> embedded_hal::blocking::spi::Transfer for Spi<'d, T, N type Error = Error; fn transfer<'w>(&mut self, words: &'w mut [u8]) -> Result<&'w [u8], Self::Error> { - Self::set_word_size(WordSize::EightBit); + self.set_word_size(WordSize::EightBit); let regs = T::regs(); for word in words.iter_mut() { @@ -441,7 +447,7 @@ impl<'d, T: Instance> embedded_hal::blocking::spi::Write for Spi<'d, T, NoD type Error = Error; fn write(&mut self, words: &[u16]) -> Result<(), Self::Error> { - Self::set_word_size(WordSize::SixteenBit); + self.set_word_size(WordSize::SixteenBit); let regs = T::regs(); for word in words.iter() { @@ -490,7 +496,7 @@ impl<'d, T: Instance> embedded_hal::blocking::spi::Transfer for Spi<'d, T, type Error = Error; fn transfer<'w>(&mut self, words: &'w mut [u16]) -> Result<&'w [u16], Self::Error> { - Self::set_word_size(WordSize::SixteenBit); + self.set_word_size(WordSize::SixteenBit); let regs = T::regs(); for word in words.iter_mut() { From e1cccc83912b1139738300690fbf82f44341f456 Mon Sep 17 00:00:00 2001 From: Grant Miller Date: Mon, 6 Dec 2021 14:47:50 -0600 Subject: [PATCH 04/10] Move Spi to mod (without NoDma defaults) --- embassy-stm32/src/spi/mod.rs | 21 +++++++++++++++++---- embassy-stm32/src/spi/v1.rs | 11 +---------- embassy-stm32/src/spi/v2.rs | 11 +---------- embassy-stm32/src/spi/v3.rs | 20 +++++--------------- 4 files changed, 24 insertions(+), 39 deletions(-) diff --git a/embassy-stm32/src/spi/mod.rs b/embassy-stm32/src/spi/mod.rs index a0bb66eb0..4899676eb 100644 --- a/embassy-stm32/src/spi/mod.rs +++ b/embassy-stm32/src/spi/mod.rs @@ -1,16 +1,19 @@ #![macro_use] +use crate::dma; +use crate::gpio::{AnyPin, NoPin, OptionalPin}; +use crate::pac::spi::vals; +use crate::peripherals; +use crate::rcc::RccPeripheral; +use core::marker::PhantomData; + #[cfg_attr(spi_v1, path = "v1.rs")] #[cfg_attr(spi_f1, path = "v1.rs")] #[cfg_attr(spi_v2, path = "v2.rs")] #[cfg_attr(spi_v3, path = "v3.rs")] mod _version; -use crate::pac::spi::vals; -use crate::{dma, peripherals, rcc::RccPeripheral}; pub use _version::*; -use crate::gpio::{NoPin, OptionalPin}; - #[derive(Debug)] #[cfg_attr(feature = "defmt", derive(defmt::Format))] pub enum Error { @@ -89,6 +92,16 @@ impl Default for Config { } } +pub struct Spi<'d, T: Instance, Tx, Rx> { + sck: Option, + mosi: Option, + miso: Option, + txdma: Tx, + rxdma: Rx, + current_word_size: WordSize, + phantom: PhantomData<&'d mut T>, +} + pub(crate) mod sealed { use super::*; diff --git a/embassy-stm32/src/spi/v1.rs b/embassy-stm32/src/spi/v1.rs index a41c79913..d7075dc43 100644 --- a/embassy-stm32/src/spi/v1.rs +++ b/embassy-stm32/src/spi/v1.rs @@ -3,7 +3,6 @@ use crate::dma::NoDma; use crate::gpio::sealed::AFType; use crate::gpio::sealed::Pin; -use crate::gpio::AnyPin; use crate::pac::spi; use crate::spi::{ ByteOrder, Config, Error, Instance, MisoPin, MosiPin, RxDmaChannel, SckPin, TxDmaChannel, @@ -20,15 +19,7 @@ pub use embedded_hal::blocking; pub use embedded_hal::spi::{Mode, Phase, Polarity, MODE_0, MODE_1, MODE_2, MODE_3}; use futures::future::join3; -pub struct Spi<'d, T: Instance, Tx, Rx> { - sck: Option, - mosi: Option, - miso: Option, - txdma: Tx, - rxdma: Rx, - current_word_size: WordSize, - phantom: PhantomData<&'d mut T>, -} +use super::Spi; impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { pub fn new( diff --git a/embassy-stm32/src/spi/v2.rs b/embassy-stm32/src/spi/v2.rs index 0c0d24ce9..94e5ca087 100644 --- a/embassy-stm32/src/spi/v2.rs +++ b/embassy-stm32/src/spi/v2.rs @@ -2,7 +2,6 @@ use crate::dma::NoDma; use crate::gpio::sealed::Pin; -use crate::gpio::AnyPin; use crate::pac::spi; use crate::spi::{ ByteOrder, Config, Error, Instance, MisoPin, MosiPin, RxDmaChannel, SckPin, TxDmaChannel, @@ -18,15 +17,7 @@ use embassy_traits::spi as traits; pub use embedded_hal::spi::{Mode, Phase, Polarity, MODE_0, MODE_1, MODE_2, MODE_3}; use futures::future::{join, join3}; -pub struct Spi<'d, T: Instance, Tx, Rx> { - sck: Option, - mosi: Option, - miso: Option, - txdma: Tx, - rxdma: Rx, - current_word_size: WordSize, - phantom: PhantomData<&'d mut T>, -} +use super::Spi; impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { pub fn new( diff --git a/embassy-stm32/src/spi/v3.rs b/embassy-stm32/src/spi/v3.rs index e2751ce20..99c3eac10 100644 --- a/embassy-stm32/src/spi/v3.rs +++ b/embassy-stm32/src/spi/v3.rs @@ -2,7 +2,6 @@ use crate::dma::NoDma; use crate::gpio::sealed::Pin; -use crate::gpio::AnyPin; use crate::pac::spi; use crate::spi::{ ByteOrder, Config, Error, Instance, MisoPin, MosiPin, RxDmaChannel, SckPin, TxDmaChannel, @@ -19,16 +18,7 @@ pub use embedded_hal::spi::{Mode, Phase, Polarity, MODE_0, MODE_1, MODE_2, MODE_ use futures::future::join3; -#[allow(unused)] -pub struct Spi<'d, T: Instance, Tx = NoDma, Rx = NoDma> { - sck: Option, - mosi: Option, - miso: Option, - txdma: Tx, - rxdma: Rx, - current_word_size: WordSize, - phantom: PhantomData<&'d mut T>, -} +use super::Spi; impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { pub fn new( @@ -338,7 +328,7 @@ impl<'d, T: Instance, Tx, Rx> Drop for Spi<'d, T, Tx, Rx> { } } -impl<'d, T: Instance> embedded_hal::blocking::spi::Write for Spi<'d, T, NoDma> { +impl<'d, T: Instance> embedded_hal::blocking::spi::Write for Spi<'d, T, NoDma, NoDma> { type Error = Error; fn write(&mut self, words: &[u8]) -> Result<(), Self::Error> { @@ -386,7 +376,7 @@ impl<'d, T: Instance> embedded_hal::blocking::spi::Write for Spi<'d, T, NoDm } } -impl<'d, T: Instance> embedded_hal::blocking::spi::Transfer for Spi<'d, T, NoDma> { +impl<'d, T: Instance> embedded_hal::blocking::spi::Transfer for Spi<'d, T, NoDma, NoDma> { type Error = Error; fn transfer<'w>(&mut self, words: &'w mut [u8]) -> Result<&'w [u8], Self::Error> { @@ -443,7 +433,7 @@ impl<'d, T: Instance> embedded_hal::blocking::spi::Transfer for Spi<'d, T, N } } -impl<'d, T: Instance> embedded_hal::blocking::spi::Write for Spi<'d, T, NoDma> { +impl<'d, T: Instance> embedded_hal::blocking::spi::Write for Spi<'d, T, NoDma, NoDma> { type Error = Error; fn write(&mut self, words: &[u16]) -> Result<(), Self::Error> { @@ -492,7 +482,7 @@ impl<'d, T: Instance> embedded_hal::blocking::spi::Write for Spi<'d, T, NoD } } -impl<'d, T: Instance> embedded_hal::blocking::spi::Transfer for Spi<'d, T, NoDma> { +impl<'d, T: Instance> embedded_hal::blocking::spi::Transfer for Spi<'d, T, NoDma, NoDma> { type Error = Error; fn transfer<'w>(&mut self, words: &'w mut [u16]) -> Result<&'w [u16], Self::Error> { From 75374ce7e853143fdc16bd194342e6ef8bcac513 Mon Sep 17 00:00:00 2001 From: Grant Miller Date: Mon, 6 Dec 2021 14:57:53 -0600 Subject: [PATCH 05/10] Fix ssoe in v1 --- embassy-stm32/src/spi/v1.rs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/embassy-stm32/src/spi/v1.rs b/embassy-stm32/src/spi/v1.rs index d7075dc43..1b870c2dc 100644 --- a/embassy-stm32/src/spi/v1.rs +++ b/embassy-stm32/src/spi/v1.rs @@ -52,18 +52,15 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { miso.as_ref().map(|x| x.set_as_af(miso_af, AFType::Input)); } - unsafe { - T::regs().cr2().modify(|w| { - w.set_ssoe(false); - }); - } - let pclk = T::frequency(); let br = Self::compute_baud_rate(pclk, freq.into()); unsafe { T::enable(); T::reset(); + T::regs().cr2().modify(|w| { + w.set_ssoe(false); + }); T::regs().cr1().modify(|w| { w.set_cpha( match config.mode.phase == Phase::CaptureOnSecondTransition { From a35f337bd68645dbc0462d09220457c22bbd5c17 Mon Sep 17 00:00:00 2001 From: Grant Miller Date: Mon, 6 Dec 2021 15:19:24 -0600 Subject: [PATCH 06/10] Move Spi::new and Spi::compute_baud_rate to mod --- embassy-stm32/src/spi/mod.rs | 188 +++++++++++++++++++++++++++++++++++ embassy-stm32/src/spi/v1.rs | 105 +------------------ embassy-stm32/src/spi/v2.rs | 108 +------------------- embassy-stm32/src/spi/v3.rs | 119 +--------------------- 4 files changed, 191 insertions(+), 329 deletions(-) diff --git a/embassy-stm32/src/spi/mod.rs b/embassy-stm32/src/spi/mod.rs index 4899676eb..70f40f0ea 100644 --- a/embassy-stm32/src/spi/mod.rs +++ b/embassy-stm32/src/spi/mod.rs @@ -1,11 +1,15 @@ #![macro_use] use crate::dma; +use crate::gpio::sealed::{AFType, Pin}; use crate::gpio::{AnyPin, NoPin, OptionalPin}; use crate::pac::spi::vals; use crate::peripherals; use crate::rcc::RccPeripheral; +use crate::time::Hertz; use core::marker::PhantomData; +use embassy::util::Unborrow; +use embassy_hal_common::unborrow; #[cfg_attr(spi_v1, path = "v1.rs")] #[cfg_attr(spi_f1, path = "v1.rs")] @@ -102,6 +106,190 @@ pub struct Spi<'d, T: Instance, Tx, Rx> { phantom: PhantomData<&'d mut T>, } +impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { + pub fn new( + _peri: impl Unborrow + 'd, + sck: impl Unborrow>, + mosi: impl Unborrow>, + miso: impl Unborrow>, + txdma: impl Unborrow, + rxdma: impl Unborrow, + freq: F, + config: Config, + ) -> Self + where + F: Into, + { + unborrow!(sck, mosi, miso, txdma, rxdma); + + let sck_af = sck.af_num(); + let mosi_af = mosi.af_num(); + let miso_af = miso.af_num(); + let sck = sck.degrade_optional(); + let mosi = mosi.degrade_optional(); + let miso = miso.degrade_optional(); + + unsafe { + sck.as_ref().map(|x| { + x.set_as_af(sck_af, AFType::OutputPushPull); + #[cfg(any(spi_v2, spi_v3))] + x.set_speed(crate::gpio::Speed::VeryHigh); + }); + mosi.as_ref().map(|x| { + x.set_as_af(mosi_af, AFType::OutputPushPull); + #[cfg(any(spi_v2, spi_v3))] + x.set_speed(crate::gpio::Speed::VeryHigh); + }); + miso.as_ref().map(|x| { + x.set_as_af(miso_af, AFType::Input); + #[cfg(any(spi_v2, spi_v3))] + x.set_speed(crate::gpio::Speed::VeryHigh); + }); + } + + let pclk = T::frequency(); + let br = Self::compute_baud_rate(pclk, freq.into()); + + #[cfg(any(spi_v1, spi_f1))] + unsafe { + T::enable(); + T::reset(); + T::regs().cr2().modify(|w| { + w.set_ssoe(false); + }); + T::regs().cr1().modify(|w| { + w.set_cpha( + match config.mode.phase == Phase::CaptureOnSecondTransition { + true => vals::Cpha::SECONDEDGE, + false => vals::Cpha::FIRSTEDGE, + }, + ); + w.set_cpol(match config.mode.polarity == Polarity::IdleHigh { + true => vals::Cpol::IDLEHIGH, + false => vals::Cpol::IDLELOW, + }); + + w.set_mstr(vals::Mstr::MASTER); + w.set_br(vals::Br(br)); + w.set_spe(true); + w.set_lsbfirst(match config.byte_order { + ByteOrder::LsbFirst => vals::Lsbfirst::LSBFIRST, + ByteOrder::MsbFirst => vals::Lsbfirst::MSBFIRST, + }); + w.set_ssi(true); + w.set_ssm(true); + w.set_crcen(false); + w.set_bidimode(vals::Bidimode::UNIDIRECTIONAL); + if mosi.is_none() { + w.set_rxonly(vals::Rxonly::OUTPUTDISABLED); + } + w.set_dff(WordSize::EightBit.dff()) + }); + } + #[cfg(spi_v2)] + unsafe { + T::enable(); + T::reset(); + T::regs().cr2().modify(|w| { + w.set_ssoe(false); + }); + T::regs().cr1().modify(|w| { + w.set_cpha( + match config.mode.phase == Phase::CaptureOnSecondTransition { + true => vals::Cpha::SECONDEDGE, + false => vals::Cpha::FIRSTEDGE, + }, + ); + w.set_cpol(match config.mode.polarity == Polarity::IdleHigh { + true => vals::Cpol::IDLEHIGH, + false => vals::Cpol::IDLELOW, + }); + + w.set_mstr(vals::Mstr::MASTER); + w.set_br(vals::Br(br)); + w.set_lsbfirst(match config.byte_order { + ByteOrder::LsbFirst => vals::Lsbfirst::LSBFIRST, + ByteOrder::MsbFirst => vals::Lsbfirst::MSBFIRST, + }); + w.set_ssi(true); + w.set_ssm(true); + w.set_crcen(false); + w.set_bidimode(vals::Bidimode::UNIDIRECTIONAL); + w.set_spe(true); + }); + } + #[cfg(spi_v3)] + unsafe { + T::enable(); + T::reset(); + T::regs().ifcr().write(|w| w.0 = 0xffff_ffff); + T::regs().cfg2().modify(|w| { + //w.set_ssoe(true); + w.set_ssoe(false); + w.set_cpha( + match config.mode.phase == Phase::CaptureOnSecondTransition { + true => vals::Cpha::SECONDEDGE, + false => vals::Cpha::FIRSTEDGE, + }, + ); + w.set_cpol(match config.mode.polarity == Polarity::IdleHigh { + true => vals::Cpol::IDLEHIGH, + false => vals::Cpol::IDLELOW, + }); + w.set_lsbfrst(match config.byte_order { + ByteOrder::LsbFirst => vals::Lsbfrst::LSBFIRST, + ByteOrder::MsbFirst => vals::Lsbfrst::MSBFIRST, + }); + w.set_ssm(true); + w.set_master(vals::Master::MASTER); + w.set_comm(vals::Comm::FULLDUPLEX); + w.set_ssom(vals::Ssom::ASSERTED); + w.set_midi(0); + w.set_mssi(0); + w.set_afcntr(vals::Afcntr::CONTROLLED); + w.set_ssiop(vals::Ssiop::ACTIVEHIGH); + }); + T::regs().cfg1().modify(|w| { + w.set_crcen(false); + w.set_mbr(vals::Mbr(br)); + w.set_dsize(WordSize::EightBit.dsize()); + }); + T::regs().cr2().modify(|w| { + w.set_tsize(0); + w.set_tser(0); + }); + T::regs().cr1().modify(|w| { + w.set_ssi(false); + w.set_spe(true); + }); + } + + Self { + sck, + mosi, + miso, + txdma, + rxdma, + current_word_size: WordSize::EightBit, + phantom: PhantomData, + } + } + + fn compute_baud_rate(clocks: Hertz, freq: Hertz) -> u8 { + match clocks.0 / freq.0 { + 0 => unreachable!(), + 1..=2 => 0b000, + 3..=5 => 0b001, + 6..=11 => 0b010, + 12..=23 => 0b011, + 24..=39 => 0b100, + 40..=95 => 0b101, + 96..=191 => 0b110, + _ => 0b111, + } + } +} + pub(crate) mod sealed { use super::*; diff --git a/embassy-stm32/src/spi/v1.rs b/embassy-stm32/src/spi/v1.rs index 1b870c2dc..8cdc3cd59 100644 --- a/embassy-stm32/src/spi/v1.rs +++ b/embassy-stm32/src/spi/v1.rs @@ -1,19 +1,10 @@ #![macro_use] use crate::dma::NoDma; -use crate::gpio::sealed::AFType; use crate::gpio::sealed::Pin; -use crate::pac::spi; -use crate::spi::{ - ByteOrder, Config, Error, Instance, MisoPin, MosiPin, RxDmaChannel, SckPin, TxDmaChannel, - WordSize, -}; -use crate::time::Hertz; +use crate::spi::{Error, Instance, RxDmaChannel, TxDmaChannel, WordSize}; use core::future::Future; -use core::marker::PhantomData; use core::ptr; -use embassy::util::Unborrow; -use embassy_hal_common::unborrow; use embassy_traits::spi as traits; pub use embedded_hal::blocking; pub use embedded_hal::spi::{Mode, Phase, Polarity, MODE_0, MODE_1, MODE_2, MODE_3}; @@ -22,100 +13,6 @@ use futures::future::join3; use super::Spi; impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { - pub fn new( - _peri: impl Unborrow + 'd, - sck: impl Unborrow>, - mosi: impl Unborrow>, - miso: impl Unborrow>, - txdma: impl Unborrow, - rxdma: impl Unborrow, - freq: F, - config: Config, - ) -> Self - where - F: Into, - { - unborrow!(sck, mosi, miso, txdma, rxdma); - - let sck_af = sck.af_num(); - let mosi_af = mosi.af_num(); - let miso_af = miso.af_num(); - let sck = sck.degrade_optional(); - let mosi = mosi.degrade_optional(); - let miso = miso.degrade_optional(); - - unsafe { - sck.as_ref() - .map(|x| x.set_as_af(sck_af, AFType::OutputPushPull)); - mosi.as_ref() - .map(|x| x.set_as_af(mosi_af, AFType::OutputPushPull)); - miso.as_ref().map(|x| x.set_as_af(miso_af, AFType::Input)); - } - - let pclk = T::frequency(); - let br = Self::compute_baud_rate(pclk, freq.into()); - - unsafe { - T::enable(); - T::reset(); - T::regs().cr2().modify(|w| { - w.set_ssoe(false); - }); - T::regs().cr1().modify(|w| { - w.set_cpha( - match config.mode.phase == Phase::CaptureOnSecondTransition { - true => spi::vals::Cpha::SECONDEDGE, - false => spi::vals::Cpha::FIRSTEDGE, - }, - ); - w.set_cpol(match config.mode.polarity == Polarity::IdleHigh { - true => spi::vals::Cpol::IDLEHIGH, - false => spi::vals::Cpol::IDLELOW, - }); - - w.set_mstr(spi::vals::Mstr::MASTER); - w.set_br(spi::vals::Br(br)); - w.set_spe(true); - w.set_lsbfirst(match config.byte_order { - ByteOrder::LsbFirst => spi::vals::Lsbfirst::LSBFIRST, - ByteOrder::MsbFirst => spi::vals::Lsbfirst::MSBFIRST, - }); - w.set_ssi(true); - w.set_ssm(true); - w.set_crcen(false); - w.set_bidimode(spi::vals::Bidimode::UNIDIRECTIONAL); - if mosi.is_none() { - w.set_rxonly(spi::vals::Rxonly::OUTPUTDISABLED); - } - w.set_dff(WordSize::EightBit.dff()) - }); - } - - Self { - sck, - mosi, - miso, - txdma, - rxdma, - current_word_size: WordSize::EightBit, - phantom: PhantomData, - } - } - - fn compute_baud_rate(clocks: Hertz, freq: Hertz) -> u8 { - match clocks.0 / freq.0 { - 0 => unreachable!(), - 1..=2 => 0b000, - 3..=5 => 0b001, - 6..=11 => 0b010, - 12..=23 => 0b011, - 24..=39 => 0b100, - 40..=95 => 0b101, - 96..=191 => 0b110, - _ => 0b111, - } - } - fn set_word_size(&mut self, word_size: WordSize) { if self.current_word_size == word_size { return; diff --git a/embassy-stm32/src/spi/v2.rs b/embassy-stm32/src/spi/v2.rs index 94e5ca087..a34266992 100644 --- a/embassy-stm32/src/spi/v2.rs +++ b/embassy-stm32/src/spi/v2.rs @@ -2,17 +2,9 @@ use crate::dma::NoDma; use crate::gpio::sealed::Pin; -use crate::pac::spi; -use crate::spi::{ - ByteOrder, Config, Error, Instance, MisoPin, MosiPin, RxDmaChannel, SckPin, TxDmaChannel, - WordSize, -}; -use crate::time::Hertz; +use crate::spi::{Error, Instance, RxDmaChannel, TxDmaChannel, WordSize}; use core::future::Future; -use core::marker::PhantomData; use core::ptr; -use embassy::util::Unborrow; -use embassy_hal_common::unborrow; use embassy_traits::spi as traits; pub use embedded_hal::spi::{Mode, Phase, Polarity, MODE_0, MODE_1, MODE_2, MODE_3}; use futures::future::{join, join3}; @@ -20,104 +12,6 @@ use futures::future::{join, join3}; use super::Spi; impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { - pub fn new( - _peri: impl Unborrow + 'd, - sck: impl Unborrow>, - mosi: impl Unborrow>, - miso: impl Unborrow>, - txdma: impl Unborrow, - rxdma: impl Unborrow, - freq: F, - config: Config, - ) -> Self - where - F: Into, - { - unborrow!(sck, mosi, miso, txdma, rxdma); - - let sck_af = sck.af_num(); - let mosi_af = mosi.af_num(); - let miso_af = miso.af_num(); - let sck = sck.degrade_optional(); - let mosi = mosi.degrade_optional(); - let miso = miso.degrade_optional(); - - unsafe { - sck.as_ref().map(|x| { - x.set_as_af(sck_af, crate::gpio::sealed::AFType::OutputPushPull); - x.set_speed(crate::gpio::Speed::VeryHigh); - }); - mosi.as_ref().map(|x| { - x.set_as_af(mosi_af, crate::gpio::sealed::AFType::OutputPushPull); - x.set_speed(crate::gpio::Speed::VeryHigh); - }); - miso.as_ref().map(|x| { - x.set_as_af(miso_af, crate::gpio::sealed::AFType::Input); - x.set_speed(crate::gpio::Speed::VeryHigh); - }); - } - - let pclk = T::frequency(); - let freq = freq.into(); - let br = Self::compute_baud_rate(pclk, freq); - - unsafe { - T::enable(); - T::reset(); - T::regs().cr2().modify(|w| { - w.set_ssoe(false); - }); - T::regs().cr1().modify(|w| { - w.set_cpha( - match config.mode.phase == Phase::CaptureOnSecondTransition { - true => spi::vals::Cpha::SECONDEDGE, - false => spi::vals::Cpha::FIRSTEDGE, - }, - ); - w.set_cpol(match config.mode.polarity == Polarity::IdleHigh { - true => spi::vals::Cpol::IDLEHIGH, - false => spi::vals::Cpol::IDLELOW, - }); - - w.set_mstr(spi::vals::Mstr::MASTER); - w.set_br(spi::vals::Br(br)); - w.set_lsbfirst(match config.byte_order { - ByteOrder::LsbFirst => spi::vals::Lsbfirst::LSBFIRST, - ByteOrder::MsbFirst => spi::vals::Lsbfirst::MSBFIRST, - }); - w.set_ssi(true); - w.set_ssm(true); - w.set_crcen(false); - w.set_bidimode(spi::vals::Bidimode::UNIDIRECTIONAL); - w.set_spe(true); - }); - } - - Self { - sck, - mosi, - miso, - txdma, - rxdma, - current_word_size: WordSize::EightBit, - phantom: PhantomData, - } - } - - fn compute_baud_rate(clocks: Hertz, freq: Hertz) -> u8 { - match clocks.0 / freq.0 { - 0 => unreachable!(), - 1..=2 => 0b000, - 3..=5 => 0b001, - 6..=11 => 0b010, - 12..=23 => 0b011, - 24..=39 => 0b100, - 40..=95 => 0b101, - 96..=191 => 0b110, - _ => 0b111, - } - } - fn set_word_size(&mut self, word_size: WordSize) { if self.current_word_size == word_size { return; diff --git a/embassy-stm32/src/spi/v3.rs b/embassy-stm32/src/spi/v3.rs index 99c3eac10..59afa553b 100644 --- a/embassy-stm32/src/spi/v3.rs +++ b/embassy-stm32/src/spi/v3.rs @@ -2,17 +2,9 @@ use crate::dma::NoDma; use crate::gpio::sealed::Pin; -use crate::pac::spi; -use crate::spi::{ - ByteOrder, Config, Error, Instance, MisoPin, MosiPin, RxDmaChannel, SckPin, TxDmaChannel, - WordSize, -}; -use crate::time::Hertz; +use crate::spi::{Error, Instance, RxDmaChannel, TxDmaChannel, WordSize}; use core::future::Future; -use core::marker::PhantomData; use core::ptr; -use embassy::util::Unborrow; -use embassy_hal_common::unborrow; use embassy_traits::spi as traits; pub use embedded_hal::spi::{Mode, Phase, Polarity, MODE_0, MODE_1, MODE_2, MODE_3}; @@ -21,115 +13,6 @@ use futures::future::join3; use super::Spi; impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { - pub fn new( - _peri: impl Unborrow + 'd, - sck: impl Unborrow>, - mosi: impl Unborrow>, - miso: impl Unborrow>, - txdma: impl Unborrow, - rxdma: impl Unborrow, - freq: F, - config: Config, - ) -> Self - where - F: Into, - { - unborrow!(sck, mosi, miso, txdma, rxdma); - - let sck_af = sck.af_num(); - let mosi_af = mosi.af_num(); - let miso_af = miso.af_num(); - let sck = sck.degrade_optional(); - let mosi = mosi.degrade_optional(); - let miso = miso.degrade_optional(); - - unsafe { - sck.as_ref().map(|x| { - x.set_as_af(sck_af, crate::gpio::sealed::AFType::OutputPushPull); - x.set_speed(crate::gpio::Speed::VeryHigh); - }); - mosi.as_ref().map(|x| { - x.set_as_af(mosi_af, crate::gpio::sealed::AFType::OutputPushPull); - x.set_speed(crate::gpio::Speed::VeryHigh); - }); - miso.as_ref().map(|x| { - x.set_as_af(miso_af, crate::gpio::sealed::AFType::Input); - x.set_speed(crate::gpio::Speed::VeryHigh); - }); - } - - let pclk = T::frequency(); - let br = Self::compute_baud_rate(pclk, freq.into()); - unsafe { - T::enable(); - T::reset(); - T::regs().ifcr().write(|w| w.0 = 0xffff_ffff); - T::regs().cfg2().modify(|w| { - //w.set_ssoe(true); - w.set_ssoe(false); - w.set_cpha( - match config.mode.phase == Phase::CaptureOnSecondTransition { - true => spi::vals::Cpha::SECONDEDGE, - false => spi::vals::Cpha::FIRSTEDGE, - }, - ); - w.set_cpol(match config.mode.polarity == Polarity::IdleHigh { - true => spi::vals::Cpol::IDLEHIGH, - false => spi::vals::Cpol::IDLELOW, - }); - w.set_lsbfrst(match config.byte_order { - ByteOrder::LsbFirst => spi::vals::Lsbfrst::LSBFIRST, - ByteOrder::MsbFirst => spi::vals::Lsbfrst::MSBFIRST, - }); - w.set_ssm(true); - w.set_master(spi::vals::Master::MASTER); - w.set_comm(spi::vals::Comm::FULLDUPLEX); - w.set_ssom(spi::vals::Ssom::ASSERTED); - w.set_midi(0); - w.set_mssi(0); - w.set_afcntr(spi::vals::Afcntr::CONTROLLED); - w.set_ssiop(spi::vals::Ssiop::ACTIVEHIGH); - }); - T::regs().cfg1().modify(|w| { - w.set_crcen(false); - w.set_mbr(spi::vals::Mbr(br)); - w.set_dsize(WordSize::EightBit.dsize()); - }); - T::regs().cr2().modify(|w| { - w.set_tsize(0); - w.set_tser(0); - }); - T::regs().cr1().modify(|w| { - w.set_ssi(false); - w.set_spe(true); - }); - } - - Self { - sck, - mosi, - miso, - txdma, - rxdma, - current_word_size: WordSize::EightBit, - phantom: PhantomData, - } - } - - fn compute_baud_rate(clocks: Hertz, freq: Hertz) -> u8 { - match clocks.0 / freq.0 { - 0 => unreachable!(), - 1..=2 => 0b000, - 3..=5 => 0b001, - 6..=11 => 0b010, - 12..=23 => 0b011, - 24..=39 => 0b100, - 40..=95 => 0b101, - 96..=191 => 0b110, - _ => 0b111, - } - } - fn set_word_size(&mut self, word_size: WordSize) { if self.current_word_size == word_size { return; From a35b7d90bc3792d226aa54b74fef18c192946d5c Mon Sep 17 00:00:00 2001 From: Grant Miller Date: Mon, 6 Dec 2021 16:33:06 -0600 Subject: [PATCH 07/10] Add tx_ptr and rx_ptr methods --- embassy-stm32/src/spi/mod.rs | 23 +++++++++++++++++++++++ embassy-stm32/src/spi/v1.rs | 18 ++++++++---------- embassy-stm32/src/spi/v2.rs | 18 ++++++++---------- embassy-stm32/src/spi/v3.rs | 24 ++++++++++-------------- 4 files changed, 49 insertions(+), 34 deletions(-) diff --git a/embassy-stm32/src/spi/mod.rs b/embassy-stm32/src/spi/mod.rs index 70f40f0ea..5420ba365 100644 --- a/embassy-stm32/src/spi/mod.rs +++ b/embassy-stm32/src/spi/mod.rs @@ -290,6 +290,29 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { } } +trait RegsExt { + fn tx_ptr(&self) -> *mut W; + fn rx_ptr(&self) -> *mut W; +} + +impl RegsExt for crate::pac::spi::Spi { + fn tx_ptr(&self) -> *mut W { + #[cfg(not(spi_v3))] + let dr = self.dr(); + #[cfg(spi_v3)] + let dr = self.txdr(); + dr.ptr() as *mut W + } + + fn rx_ptr(&self) -> *mut W { + #[cfg(not(spi_v3))] + let dr = self.dr(); + #[cfg(spi_v3)] + let dr = self.rxdr(); + dr.ptr() as *mut W + } +} + pub(crate) mod sealed { use super::*; diff --git a/embassy-stm32/src/spi/v1.rs b/embassy-stm32/src/spi/v1.rs index 8cdc3cd59..b98a78343 100644 --- a/embassy-stm32/src/spi/v1.rs +++ b/embassy-stm32/src/spi/v1.rs @@ -2,7 +2,7 @@ use crate::dma::NoDma; use crate::gpio::sealed::Pin; -use crate::spi::{Error, Instance, RxDmaChannel, TxDmaChannel, WordSize}; +use crate::spi::{Error, Instance, RegsExt, RxDmaChannel, TxDmaChannel, WordSize}; use core::future::Future; use core::ptr; use embassy_traits::spi as traits; @@ -42,7 +42,7 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { self.set_word_size(WordSize::EightBit); let request = self.txdma.request(); - let dst = T::regs().dr().ptr() as *mut u8; + let dst = T::regs().tx_ptr(); let f = self.txdma.write(request, write, dst); unsafe { @@ -77,11 +77,11 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { let clock_byte_count = read.len(); let rx_request = self.rxdma.request(); - let rx_src = T::regs().dr().ptr() as *mut u8; + let rx_src = T::regs().rx_ptr(); let rx_f = self.rxdma.read(rx_request, rx_src, read); let tx_request = self.txdma.request(); - let tx_dst = T::regs().dr().ptr() as *mut u8; + let tx_dst = T::regs().tx_ptr(); let clock_byte = 0x00; let tx_f = self .txdma @@ -130,13 +130,13 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { self.set_word_size(WordSize::EightBit); let rx_request = self.rxdma.request(); - let rx_src = T::regs().dr().ptr() as *mut u8; + let rx_src = T::regs().rx_ptr(); let rx_f = self .rxdma .read(rx_request, rx_src, &mut read[0..write.len()]); let tx_request = self.txdma.request(); - let tx_dst = T::regs().dr().ptr() as *mut u8; + let tx_dst = T::regs().tx_ptr(); let tx_f = self.txdma.write(tx_request, write, tx_dst); unsafe { @@ -308,8 +308,7 @@ fn write_word(regs: &'static crate::pac::spi::Spi, word: W) -> Result<( } if sr.txe() { unsafe { - let dr = regs.dr().ptr() as *mut W; - ptr::write_volatile(dr, word); + ptr::write_volatile(regs.tx_ptr(), word); } return Ok(()); } @@ -335,8 +334,7 @@ fn read_word(regs: &'static crate::pac::spi::Spi) -> Result { } if sr.rxne() { unsafe { - let dr = regs.dr().ptr() as *const W; - return Ok(ptr::read_volatile(dr)); + return Ok(ptr::read_volatile(regs.rx_ptr())); } } } diff --git a/embassy-stm32/src/spi/v2.rs b/embassy-stm32/src/spi/v2.rs index a34266992..5c62400eb 100644 --- a/embassy-stm32/src/spi/v2.rs +++ b/embassy-stm32/src/spi/v2.rs @@ -2,7 +2,7 @@ use crate::dma::NoDma; use crate::gpio::sealed::Pin; -use crate::spi::{Error, Instance, RxDmaChannel, TxDmaChannel, WordSize}; +use crate::spi::{Error, Instance, RegsExt, RxDmaChannel, TxDmaChannel, WordSize}; use core::future::Future; use core::ptr; use embassy_traits::spi as traits; @@ -44,7 +44,7 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { self.set_word_size(WordSize::EightBit); let request = self.txdma.request(); - let dst = T::regs().dr().ptr() as *mut u8; + let dst = T::regs().tx_ptr(); let f = self.txdma.write(request, write, dst); unsafe { @@ -88,11 +88,11 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { let clock_byte_count = read.len(); let rx_request = self.rxdma.request(); - let rx_src = T::regs().dr().ptr() as *mut u8; + let rx_src = T::regs().rx_ptr(); let rx_f = self.rxdma.read(rx_request, rx_src, read); let tx_request = self.txdma.request(); - let tx_dst = T::regs().dr().ptr() as *mut u8; + let tx_dst = T::regs().tx_ptr(); let clock_byte = 0x00; let tx_f = self .txdma @@ -146,13 +146,13 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { self.set_word_size(WordSize::EightBit); let rx_request = self.rxdma.request(); - let rx_src = T::regs().dr().ptr() as *mut u8; + let rx_src = T::regs().rx_ptr(); let rx_f = self .rxdma .read(rx_request, rx_src, &mut read[0..write.len()]); let tx_request = self.txdma.request(); - let tx_dst = T::regs().dr().ptr() as *mut u8; + let tx_dst = T::regs().tx_ptr(); let tx_f = self.txdma.write(tx_request, write, tx_dst); unsafe { @@ -223,8 +223,7 @@ fn write_word(regs: &'static crate::pac::spi::Spi, word: W) -> Result<( return Err(Error::Crc); } else if sr.txe() { unsafe { - let dr = regs.dr().ptr() as *mut W; - ptr::write_volatile(dr, word); + ptr::write_volatile(regs.tx_ptr(), word); } return Ok(()); } @@ -245,8 +244,7 @@ fn read_word(regs: &'static crate::pac::spi::Spi) -> Result { return Err(Error::Crc); } else if sr.rxne() { unsafe { - let dr = regs.dr().ptr() as *const W; - return Ok(ptr::read_volatile(dr)); + return Ok(ptr::read_volatile(regs.rx_ptr())); } } } diff --git a/embassy-stm32/src/spi/v3.rs b/embassy-stm32/src/spi/v3.rs index 59afa553b..a23a6dd02 100644 --- a/embassy-stm32/src/spi/v3.rs +++ b/embassy-stm32/src/spi/v3.rs @@ -2,7 +2,7 @@ use crate::dma::NoDma; use crate::gpio::sealed::Pin; -use crate::spi::{Error, Instance, RxDmaChannel, TxDmaChannel, WordSize}; +use crate::spi::{Error, Instance, RegsExt, RxDmaChannel, TxDmaChannel, WordSize}; use core::future::Future; use core::ptr; use embassy_traits::spi as traits; @@ -49,7 +49,7 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { } let request = self.txdma.request(); - let dst = T::regs().txdr().ptr() as *mut u8; + let dst = T::regs().tx_ptr(); let f = self.txdma.write(request, write, dst); unsafe { @@ -96,11 +96,11 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { let clock_byte_count = read.len(); let rx_request = self.rxdma.request(); - let rx_src = T::regs().rxdr().ptr() as *mut u8; + let rx_src = T::regs().rx_ptr(); let rx_f = self.rxdma.read(rx_request, rx_src, read); let tx_request = self.txdma.request(); - let tx_dst = T::regs().txdr().ptr() as *mut u8; + let tx_dst = T::regs().tx_ptr(); let clock_byte = 0x00; let tx_f = self .txdma @@ -155,13 +155,13 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { } let rx_request = self.rxdma.request(); - let rx_src = T::regs().rxdr().ptr() as *mut u8; + let rx_src = T::regs().rx_ptr(); let rx_f = self .rxdma .read(rx_request, rx_src, &mut read[0..write.len()]); let tx_request = self.txdma.request(); - let tx_dst = T::regs().txdr().ptr() as *mut u8; + let tx_dst = T::regs().tx_ptr(); let tx_f = self.txdma.write(tx_request, write, tx_dst); unsafe { @@ -223,8 +223,7 @@ impl<'d, T: Instance> embedded_hal::blocking::spi::Write for Spi<'d, T, NoDm // spin } unsafe { - let txdr = regs.txdr().ptr() as *mut u8; - ptr::write_volatile(txdr, *word); + ptr::write_volatile(regs.tx_ptr(), *word); regs.cr1().modify(|reg| reg.set_cstart(true)); } loop { @@ -245,9 +244,8 @@ impl<'d, T: Instance> embedded_hal::blocking::spi::Write for Spi<'d, T, NoDm break; } unsafe { - let rxdr = regs.rxdr().ptr() as *const u8; // discard read to prevent pverrun. - let _ = ptr::read_volatile(rxdr); + let _: u8 = ptr::read_volatile(T::regs().rx_ptr()); } } @@ -276,8 +274,7 @@ impl<'d, T: Instance> embedded_hal::blocking::spi::Transfer for Spi<'d, T, N // spin } unsafe { - let txdr = regs.txdr().ptr() as *mut u8; - ptr::write_volatile(txdr, *word); + ptr::write_volatile(T::regs().tx_ptr(), *word); regs.cr1().modify(|reg| reg.set_cstart(true)); } loop { @@ -297,8 +294,7 @@ impl<'d, T: Instance> embedded_hal::blocking::spi::Transfer for Spi<'d, T, N } } unsafe { - let rxdr = regs.rxdr().ptr() as *const u8; - *word = ptr::read_volatile(rxdr); + *word = ptr::read_volatile(T::regs().rx_ptr()); } let sr = unsafe { regs.sr().read() }; if sr.tifre() { From bd9e730024fc74b1c382c571a07a3b3551bb1110 Mon Sep 17 00:00:00 2001 From: Grant Miller Date: Mon, 6 Dec 2021 16:47:08 -0600 Subject: [PATCH 08/10] Move set_word_size to mod --- embassy-stm32/src/spi/mod.rs | 49 ++++++++++++++++++++++++++++++++++++ embassy-stm32/src/spi/v1.rs | 16 ------------ embassy-stm32/src/spi/v2.rs | 19 -------------- embassy-stm32/src/spi/v3.rs | 23 ----------------- 4 files changed, 49 insertions(+), 58 deletions(-) diff --git a/embassy-stm32/src/spi/mod.rs b/embassy-stm32/src/spi/mod.rs index 5420ba365..db8ce15fd 100644 --- a/embassy-stm32/src/spi/mod.rs +++ b/embassy-stm32/src/spi/mod.rs @@ -288,6 +288,55 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { _ => 0b111, } } + + fn set_word_size(&mut self, word_size: WordSize) { + if self.current_word_size == word_size { + return; + } + + #[cfg(any(spi_v1, spi_f1))] + unsafe { + T::regs().cr1().modify(|reg| { + reg.set_spe(false); + reg.set_dff(word_size.dff()) + }); + T::regs().cr1().modify(|reg| { + reg.set_spe(true); + }); + } + #[cfg(spi_v2)] + unsafe { + T::regs().cr1().modify(|w| { + w.set_spe(false); + }); + T::regs().cr2().modify(|w| { + w.set_frxth(word_size.frxth()); + w.set_ds(word_size.ds()); + }); + T::regs().cr1().modify(|w| { + w.set_spe(true); + }); + } + #[cfg(spi_v3)] + unsafe { + T::regs().cr1().modify(|w| { + w.set_csusp(true); + }); + while T::regs().sr().read().eot() {} + T::regs().cr1().modify(|w| { + w.set_spe(false); + }); + T::regs().cfg1().modify(|w| { + w.set_dsize(word_size.dsize()); + }); + T::regs().cr1().modify(|w| { + w.set_csusp(false); + w.set_spe(true); + }); + } + + self.current_word_size = word_size; + } } trait RegsExt { diff --git a/embassy-stm32/src/spi/v1.rs b/embassy-stm32/src/spi/v1.rs index b98a78343..cd9383d14 100644 --- a/embassy-stm32/src/spi/v1.rs +++ b/embassy-stm32/src/spi/v1.rs @@ -13,22 +13,6 @@ use futures::future::join3; use super::Spi; impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { - fn set_word_size(&mut self, word_size: WordSize) { - if self.current_word_size == word_size { - return; - } - unsafe { - T::regs().cr1().modify(|reg| { - reg.set_spe(false); - reg.set_dff(word_size.dff()) - }); - T::regs().cr1().modify(|reg| { - reg.set_spe(true); - }); - } - self.current_word_size = word_size; - } - #[allow(unused)] async fn write_dma_u8(&mut self, write: &[u8]) -> Result<(), Error> where diff --git a/embassy-stm32/src/spi/v2.rs b/embassy-stm32/src/spi/v2.rs index 5c62400eb..9817311fa 100644 --- a/embassy-stm32/src/spi/v2.rs +++ b/embassy-stm32/src/spi/v2.rs @@ -12,25 +12,6 @@ use futures::future::{join, join3}; use super::Spi; impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { - fn set_word_size(&mut self, word_size: WordSize) { - if self.current_word_size == word_size { - return; - } - unsafe { - T::regs().cr1().modify(|w| { - w.set_spe(false); - }); - T::regs().cr2().modify(|w| { - w.set_frxth(word_size.frxth()); - w.set_ds(word_size.ds()); - }); - T::regs().cr1().modify(|w| { - w.set_spe(true); - }); - } - self.current_word_size = word_size; - } - #[allow(unused)] async fn write_dma_u8(&mut self, write: &[u8]) -> Result<(), Error> where diff --git a/embassy-stm32/src/spi/v3.rs b/embassy-stm32/src/spi/v3.rs index a23a6dd02..af39d3a06 100644 --- a/embassy-stm32/src/spi/v3.rs +++ b/embassy-stm32/src/spi/v3.rs @@ -13,29 +13,6 @@ use futures::future::join3; use super::Spi; impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { - fn set_word_size(&mut self, word_size: WordSize) { - if self.current_word_size == word_size { - return; - } - unsafe { - T::regs().cr1().modify(|w| { - w.set_csusp(true); - }); - while T::regs().sr().read().eot() {} - T::regs().cr1().modify(|w| { - w.set_spe(false); - }); - T::regs().cfg1().modify(|w| { - w.set_dsize(word_size.dsize()); - }); - T::regs().cr1().modify(|w| { - w.set_csusp(false); - w.set_spe(true); - }); - } - self.current_word_size = word_size; - } - #[allow(unused)] async fn write_dma_u8(&mut self, write: &[u8]) -> Result<(), Error> where From d76bc45e3029718e954ce7e2ffd950211ce962c3 Mon Sep 17 00:00:00 2001 From: Grant Miller Date: Mon, 6 Dec 2021 16:51:10 -0600 Subject: [PATCH 09/10] Move Spi drop impl to mod --- embassy-stm32/src/spi/mod.rs | 10 ++++++++++ embassy-stm32/src/spi/v1.rs | 11 ----------- embassy-stm32/src/spi/v2.rs | 11 ----------- embassy-stm32/src/spi/v3.rs | 11 ----------- 4 files changed, 10 insertions(+), 33 deletions(-) diff --git a/embassy-stm32/src/spi/mod.rs b/embassy-stm32/src/spi/mod.rs index db8ce15fd..410e16ee2 100644 --- a/embassy-stm32/src/spi/mod.rs +++ b/embassy-stm32/src/spi/mod.rs @@ -339,6 +339,16 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { } } +impl<'d, T: Instance, Tx, Rx> Drop for Spi<'d, T, Tx, Rx> { + fn drop(&mut self) { + unsafe { + self.sck.as_ref().map(|x| x.set_as_analog()); + self.mosi.as_ref().map(|x| x.set_as_analog()); + self.miso.as_ref().map(|x| x.set_as_analog()); + } + } +} + trait RegsExt { fn tx_ptr(&self) -> *mut W; fn rx_ptr(&self) -> *mut W; diff --git a/embassy-stm32/src/spi/v1.rs b/embassy-stm32/src/spi/v1.rs index cd9383d14..255bd950a 100644 --- a/embassy-stm32/src/spi/v1.rs +++ b/embassy-stm32/src/spi/v1.rs @@ -1,7 +1,6 @@ #![macro_use] use crate::dma::NoDma; -use crate::gpio::sealed::Pin; use crate::spi::{Error, Instance, RegsExt, RxDmaChannel, TxDmaChannel, WordSize}; use core::future::Future; use core::ptr; @@ -156,16 +155,6 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { } } -impl<'d, T: Instance, Tx, Rx> Drop for Spi<'d, T, Tx, Rx> { - fn drop(&mut self) { - unsafe { - self.sck.as_ref().map(|x| x.set_as_analog()); - self.mosi.as_ref().map(|x| x.set_as_analog()); - self.miso.as_ref().map(|x| x.set_as_analog()); - } - } -} - impl<'d, T: Instance> embedded_hal::blocking::spi::Write for Spi<'d, T, NoDma, NoDma> { type Error = Error; diff --git a/embassy-stm32/src/spi/v2.rs b/embassy-stm32/src/spi/v2.rs index 9817311fa..b1fae4bdc 100644 --- a/embassy-stm32/src/spi/v2.rs +++ b/embassy-stm32/src/spi/v2.rs @@ -1,7 +1,6 @@ #![macro_use] use crate::dma::NoDma; -use crate::gpio::sealed::Pin; use crate::spi::{Error, Instance, RegsExt, RxDmaChannel, TxDmaChannel, WordSize}; use core::future::Future; use core::ptr; @@ -175,16 +174,6 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { } } -impl<'d, T: Instance, Tx, Rx> Drop for Spi<'d, T, Tx, Rx> { - fn drop(&mut self) { - unsafe { - self.sck.as_ref().map(|x| x.set_as_analog()); - self.mosi.as_ref().map(|x| x.set_as_analog()); - self.miso.as_ref().map(|x| x.set_as_analog()); - } - } -} - trait Word {} impl Word for u8 {} diff --git a/embassy-stm32/src/spi/v3.rs b/embassy-stm32/src/spi/v3.rs index af39d3a06..052924db0 100644 --- a/embassy-stm32/src/spi/v3.rs +++ b/embassy-stm32/src/spi/v3.rs @@ -1,7 +1,6 @@ #![macro_use] use crate::dma::NoDma; -use crate::gpio::sealed::Pin; use crate::spi::{Error, Instance, RegsExt, RxDmaChannel, TxDmaChannel, WordSize}; use core::future::Future; use core::ptr; @@ -178,16 +177,6 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { } } -impl<'d, T: Instance, Tx, Rx> Drop for Spi<'d, T, Tx, Rx> { - fn drop(&mut self) { - unsafe { - self.sck.as_ref().map(|x| x.set_as_analog()); - self.mosi.as_ref().map(|x| x.set_as_analog()); - self.miso.as_ref().map(|x| x.set_as_analog()); - } - } -} - impl<'d, T: Instance> embedded_hal::blocking::spi::Write for Spi<'d, T, NoDma, NoDma> { type Error = Error; From 7c78247be32007686d0d253b8ec14fb6806b2452 Mon Sep 17 00:00:00 2001 From: Grant Miller Date: Mon, 6 Dec 2021 22:36:53 -0600 Subject: [PATCH 10/10] v2: set frxth and ds in new --- embassy-stm32/src/spi/mod.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/embassy-stm32/src/spi/mod.rs b/embassy-stm32/src/spi/mod.rs index 410e16ee2..80a05aac6 100644 --- a/embassy-stm32/src/spi/mod.rs +++ b/embassy-stm32/src/spi/mod.rs @@ -191,6 +191,8 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> { T::enable(); T::reset(); T::regs().cr2().modify(|w| { + w.set_frxth(WordSize::EightBit.frxth()); + w.set_ds(WordSize::EightBit.ds()); w.set_ssoe(false); }); T::regs().cr1().modify(|w| {