From a35f337bd68645dbc0462d09220457c22bbd5c17 Mon Sep 17 00:00:00 2001 From: Grant Miller Date: Mon, 6 Dec 2021 15:19:24 -0600 Subject: [PATCH] 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;