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

Use const REGS

Browse Source
This commit is contained in:
Grant Miller
2022-03-14 14:27:24 -05:00
parent 482ffea4dd
commit f0b62bc8e0
1 changed files with 55 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,7 @@ use self::sealed::WordSize;
use crate::dma::{slice_ptr_parts, slice_ptr_parts_mut, NoDma, Transfer}; use crate::dma::{slice_ptr_parts, slice_ptr_parts_mut, NoDma, Transfer};
use crate::gpio::sealed::{AFType, Pin as _}; use crate::gpio::sealed::{AFType, Pin as _};
use crate::gpio::AnyPin; use crate::gpio::AnyPin;
use crate::pac::spi::Spi as Regs;
use crate::pac::spi::{regs, vals}; use crate::pac::spi::{regs, vals};
use crate::peripherals; use crate::peripherals;
use crate::rcc::RccPeripheral; use crate::rcc::RccPeripheral;
@@ -17,8 +18,6 @@ use crate::time::Hertz;
pub use embedded_hal_02::spi::{Mode, Phase, Polarity, MODE_0, MODE_1, MODE_2, MODE_3}; pub use embedded_hal_02::spi::{Mode, Phase, Polarity, MODE_0, MODE_1, MODE_2, MODE_3};
type Regs = &'static crate::pac::spi::Spi;
#[derive(Debug)] #[derive(Debug)]
#[cfg_attr(feature = "defmt", derive(defmt::Format))] #[cfg_attr(feature = "defmt", derive(defmt::Format))]
pub enum Error { pub enum Error {
@@ -219,10 +218,10 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
#[cfg(any(spi_v1, spi_f1))] #[cfg(any(spi_v1, spi_f1))]
unsafe { unsafe {
T::regs().cr2().modify(|w| { T::REGS.cr2().modify(|w| {
w.set_ssoe(false); w.set_ssoe(false);
}); });
T::regs().cr1().modify(|w| { T::REGS.cr1().modify(|w| {
w.set_cpha(cpha); w.set_cpha(cpha);
w.set_cpol(cpol); w.set_cpol(cpol);
@@ -242,12 +241,12 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
} }
#[cfg(spi_v2)] #[cfg(spi_v2)]
unsafe { unsafe {
T::regs().cr2().modify(|w| { T::REGS.cr2().modify(|w| {
w.set_frxth(WordSize::EightBit.frxth()); w.set_frxth(WordSize::EightBit.frxth());
w.set_ds(WordSize::EightBit.ds()); w.set_ds(WordSize::EightBit.ds());
w.set_ssoe(false); w.set_ssoe(false);
}); });
T::regs().cr1().modify(|w| { T::REGS.cr1().modify(|w| {
w.set_cpha(cpha); w.set_cpha(cpha);
w.set_cpol(cpol); w.set_cpol(cpol);
@@ -263,8 +262,8 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
} }
#[cfg(spi_v3)] #[cfg(spi_v3)]
unsafe { unsafe {
T::regs().ifcr().write(|w| w.0 = 0xffff_ffff); T::REGS.ifcr().write(|w| w.0 = 0xffff_ffff);
T::regs().cfg2().modify(|w| { T::REGS.cfg2().modify(|w| {
//w.set_ssoe(true); //w.set_ssoe(true);
w.set_ssoe(false); w.set_ssoe(false);
w.set_cpha(cpha); w.set_cpha(cpha);
@@ -279,16 +278,16 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
w.set_afcntr(vals::Afcntr::CONTROLLED); w.set_afcntr(vals::Afcntr::CONTROLLED);
w.set_ssiop(vals::Ssiop::ACTIVEHIGH); w.set_ssiop(vals::Ssiop::ACTIVEHIGH);
}); });
T::regs().cfg1().modify(|w| { T::REGS.cfg1().modify(|w| {
w.set_crcen(false); w.set_crcen(false);
w.set_mbr(br); w.set_mbr(br);
w.set_dsize(WordSize::EightBit.dsize()); w.set_dsize(WordSize::EightBit.dsize());
}); });
T::regs().cr2().modify(|w| { T::REGS.cr2().modify(|w| {
w.set_tsize(0); w.set_tsize(0);
w.set_tser(0); w.set_tser(0);
}); });
T::regs().cr1().modify(|w| { T::REGS.cr1().modify(|w| {
w.set_ssi(false); w.set_ssi(false);
w.set_spe(true); w.set_spe(true);
}); });
@@ -314,7 +313,7 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
#[cfg(any(spi_v1, spi_f1, spi_v2))] #[cfg(any(spi_v1, spi_f1, spi_v2))]
unsafe { unsafe {
T::regs().cr1().modify(|w| { T::REGS.cr1().modify(|w| {
w.set_cpha(cpha); w.set_cpha(cpha);
w.set_cpol(cpol); w.set_cpol(cpol);
w.set_lsbfirst(lsbfirst); w.set_lsbfirst(lsbfirst);
@@ -323,7 +322,7 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
#[cfg(spi_v3)] #[cfg(spi_v3)]
unsafe { unsafe {
T::regs().cfg2().modify(|w| { T::REGS.cfg2().modify(|w| {
w.set_cpha(cpha); w.set_cpha(cpha);
w.set_cpol(cpol); w.set_cpol(cpol);
w.set_lsbfirst(lsbfirst); w.set_lsbfirst(lsbfirst);
@@ -333,9 +332,9 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
pub fn get_current_config(&self) -> Config { pub fn get_current_config(&self) -> Config {
#[cfg(any(spi_v1, spi_f1, spi_v2))] #[cfg(any(spi_v1, spi_f1, spi_v2))]
let cfg = unsafe { T::regs().cr1().read() }; let cfg = unsafe { T::REGS.cr1().read() };
#[cfg(spi_v3)] #[cfg(spi_v3)]
let cfg = unsafe { T::regs().cfg2().read() }; let cfg = unsafe { T::REGS.cfg2().read() };
let polarity = if cfg.cpol() == vals::Cpol::IDLELOW { let polarity = if cfg.cpol() == vals::Cpol::IDLELOW {
Polarity::IdleLow Polarity::IdleLow
} else { } else {
@@ -366,40 +365,40 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
#[cfg(any(spi_v1, spi_f1))] #[cfg(any(spi_v1, spi_f1))]
unsafe { unsafe {
T::regs().cr1().modify(|reg| { T::REGS.cr1().modify(|reg| {
reg.set_spe(false); reg.set_spe(false);
reg.set_dff(word_size.dff()) reg.set_dff(word_size.dff())
}); });
T::regs().cr1().modify(|reg| { T::REGS.cr1().modify(|reg| {
reg.set_spe(true); reg.set_spe(true);
}); });
} }
#[cfg(spi_v2)] #[cfg(spi_v2)]
unsafe { unsafe {
T::regs().cr1().modify(|w| { T::REGS.cr1().modify(|w| {
w.set_spe(false); w.set_spe(false);
}); });
T::regs().cr2().modify(|w| { T::REGS.cr2().modify(|w| {
w.set_frxth(word_size.frxth()); w.set_frxth(word_size.frxth());
w.set_ds(word_size.ds()); w.set_ds(word_size.ds());
}); });
T::regs().cr1().modify(|w| { T::REGS.cr1().modify(|w| {
w.set_spe(true); w.set_spe(true);
}); });
} }
#[cfg(spi_v3)] #[cfg(spi_v3)]
unsafe { unsafe {
T::regs().cr1().modify(|w| { T::REGS.cr1().modify(|w| {
w.set_csusp(true); w.set_csusp(true);
}); });
while T::regs().sr().read().eot() {} while T::REGS.sr().read().eot() {}
T::regs().cr1().modify(|w| { T::REGS.cr1().modify(|w| {
w.set_spe(false); w.set_spe(false);
}); });
T::regs().cfg1().modify(|w| { T::REGS.cfg1().modify(|w| {
w.set_dsize(word_size.dsize()); w.set_dsize(word_size.dsize());
}); });
T::regs().cr1().modify(|w| { T::REGS.cr1().modify(|w| {
w.set_csusp(false); w.set_csusp(false);
w.set_spe(true); w.set_spe(true);
}); });
@@ -414,34 +413,34 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
{ {
self.set_word_size(WordSize::EightBit); self.set_word_size(WordSize::EightBit);
unsafe { unsafe {
T::regs().cr1().modify(|w| { T::REGS.cr1().modify(|w| {
w.set_spe(false); w.set_spe(false);
}); });
} }
// TODO: This is unnecessary in some versions because // TODO: This is unnecessary in some versions because
// clearing SPE automatically clears the fifos // clearing SPE automatically clears the fifos
flush_rx_fifo(T::regs()); flush_rx_fifo(T::REGS);
let tx_request = self.txdma.request(); let tx_request = self.txdma.request();
let tx_dst = T::regs().tx_ptr(); let tx_dst = T::REGS.tx_ptr();
unsafe { self.txdma.start_write(tx_request, data, tx_dst) } unsafe { self.txdma.start_write(tx_request, data, tx_dst) }
let tx_f = Transfer::new(&mut self.txdma); let tx_f = Transfer::new(&mut self.txdma);
unsafe { unsafe {
set_txdmaen(T::regs(), true); set_txdmaen(T::REGS, true);
T::regs().cr1().modify(|w| { T::REGS.cr1().modify(|w| {
w.set_spe(true); w.set_spe(true);
}); });
#[cfg(spi_v3)] #[cfg(spi_v3)]
T::regs().cr1().modify(|w| { T::REGS.cr1().modify(|w| {
w.set_cstart(true); w.set_cstart(true);
}); });
} }
tx_f.await; tx_f.await;
finish_dma(T::regs()); finish_dma(T::REGS);
Ok(()) Ok(())
} }
@@ -453,21 +452,21 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
{ {
self.set_word_size(WordSize::EightBit); self.set_word_size(WordSize::EightBit);
unsafe { unsafe {
T::regs().cr1().modify(|w| { T::REGS.cr1().modify(|w| {
w.set_spe(false); w.set_spe(false);
}); });
set_rxdmaen(T::regs(), true); set_rxdmaen(T::REGS, true);
} }
let (_, clock_byte_count) = slice_ptr_parts_mut(data); let (_, clock_byte_count) = slice_ptr_parts_mut(data);
let rx_request = self.rxdma.request(); let rx_request = self.rxdma.request();
let rx_src = T::regs().rx_ptr(); let rx_src = T::REGS.rx_ptr();
unsafe { self.rxdma.start_read(rx_request, rx_src, data) }; unsafe { self.rxdma.start_read(rx_request, rx_src, data) };
let rx_f = Transfer::new(&mut self.rxdma); let rx_f = Transfer::new(&mut self.rxdma);
let tx_request = self.txdma.request(); let tx_request = self.txdma.request();
let tx_dst = T::regs().tx_ptr(); let tx_dst = T::REGS.tx_ptr();
let clock_byte = 0x00u8; let clock_byte = 0x00u8;
let tx_f = crate::dma::write_repeated( let tx_f = crate::dma::write_repeated(
&mut self.txdma, &mut self.txdma,
@@ -478,19 +477,19 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
); );
unsafe { unsafe {
set_txdmaen(T::regs(), true); set_txdmaen(T::REGS, true);
T::regs().cr1().modify(|w| { T::REGS.cr1().modify(|w| {
w.set_spe(true); w.set_spe(true);
}); });
#[cfg(spi_v3)] #[cfg(spi_v3)]
T::regs().cr1().modify(|w| { T::REGS.cr1().modify(|w| {
w.set_cstart(true); w.set_cstart(true);
}); });
} }
join(tx_f, rx_f).await; join(tx_f, rx_f).await;
finish_dma(T::regs()); finish_dma(T::REGS);
Ok(()) Ok(())
} }
@@ -506,79 +505,74 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
self.set_word_size(WordSize::EightBit); self.set_word_size(WordSize::EightBit);
unsafe { unsafe {
T::regs().cr1().modify(|w| { T::REGS.cr1().modify(|w| {
w.set_spe(false); w.set_spe(false);
}); });
set_rxdmaen(T::regs(), true); set_rxdmaen(T::REGS, true);
} }
// TODO: This is unnecessary in some versions because // TODO: This is unnecessary in some versions because
// clearing SPE automatically clears the fifos // clearing SPE automatically clears the fifos
flush_rx_fifo(T::regs()); flush_rx_fifo(T::REGS);
let rx_request = self.rxdma.request(); let rx_request = self.rxdma.request();
let rx_src = T::regs().rx_ptr(); let rx_src = T::REGS.rx_ptr();
unsafe { self.rxdma.start_read(rx_request, rx_src, read) }; unsafe { self.rxdma.start_read(rx_request, rx_src, read) };
let rx_f = Transfer::new(&mut self.rxdma); let rx_f = Transfer::new(&mut self.rxdma);
let tx_request = self.txdma.request(); let tx_request = self.txdma.request();
let tx_dst = T::regs().tx_ptr(); let tx_dst = T::REGS.tx_ptr();
unsafe { self.txdma.start_write(tx_request, write, tx_dst) } unsafe { self.txdma.start_write(tx_request, write, tx_dst) }
let tx_f = Transfer::new(&mut self.txdma); let tx_f = Transfer::new(&mut self.txdma);
unsafe { unsafe {
set_txdmaen(T::regs(), true); set_txdmaen(T::REGS, true);
T::regs().cr1().modify(|w| { T::REGS.cr1().modify(|w| {
w.set_spe(true); w.set_spe(true);
}); });
#[cfg(spi_v3)] #[cfg(spi_v3)]
T::regs().cr1().modify(|w| { T::REGS.cr1().modify(|w| {
w.set_cstart(true); w.set_cstart(true);
}); });
} }
join(tx_f, rx_f).await; join(tx_f, rx_f).await;
finish_dma(T::regs()); finish_dma(T::REGS);
Ok(()) Ok(())
} }
pub fn blocking_write<W: Word>(&mut self, words: &[W]) -> Result<(), Error> { pub fn blocking_write<W: Word>(&mut self, words: &[W]) -> Result<(), Error> {
self.set_word_size(W::WORDSIZE); self.set_word_size(W::WORDSIZE);
let regs = T::regs();
for word in words.iter() { for word in words.iter() {
let _ = transfer_word(regs, *word)?; let _ = transfer_word(T::REGS, *word)?;
} }
Ok(()) Ok(())
} }
pub fn blocking_read<W: Word>(&mut self, words: &mut [W]) -> Result<(), Error> { pub fn blocking_read<W: Word>(&mut self, words: &mut [W]) -> Result<(), Error> {
self.set_word_size(W::WORDSIZE); self.set_word_size(W::WORDSIZE);
let regs = T::regs();
for word in words.iter_mut() { for word in words.iter_mut() {
*word = transfer_word(regs, W::default())?; *word = transfer_word(T::REGS, W::default())?;
} }
Ok(()) Ok(())
} }
pub fn blocking_transfer_in_place<W: Word>(&mut self, words: &mut [W]) -> Result<(), Error> { pub fn blocking_transfer_in_place<W: Word>(&mut self, words: &mut [W]) -> Result<(), Error> {
self.set_word_size(W::WORDSIZE); self.set_word_size(W::WORDSIZE);
let regs = T::regs();
for word in words.iter_mut() { for word in words.iter_mut() {
*word = transfer_word(regs, *word)?; *word = transfer_word(T::REGS, *word)?;
} }
Ok(()) Ok(())
} }
pub fn blocking_transfer<W: Word>(&mut self, read: &mut [W], write: &[W]) -> Result<(), Error> { pub fn blocking_transfer<W: Word>(&mut self, read: &mut [W], write: &[W]) -> Result<(), Error> {
self.set_word_size(W::WORDSIZE); self.set_word_size(W::WORDSIZE);
let regs = T::regs();
let len = read.len().max(write.len()); let len = read.len().max(write.len());
for i in 0..len { for i in 0..len {
let wb = write.get(i).copied().unwrap_or_default(); let wb = write.get(i).copied().unwrap_or_default();
let rb = transfer_word(regs, wb)?; let rb = transfer_word(T::REGS, wb)?;
if let Some(r) = read.get_mut(i) { if let Some(r) = read.get_mut(i) {
*r = rb; *r = rb;
} }
@@ -623,7 +617,7 @@ trait RegsExt {
fn rx_ptr<W>(&self) -> *mut W; fn rx_ptr<W>(&self) -> *mut W;
} }
impl RegsExt for crate::pac::spi::Spi { impl RegsExt for Regs {
fn tx_ptr<W>(&self) -> *mut W { fn tx_ptr<W>(&self) -> *mut W {
#[cfg(not(spi_v3))] #[cfg(not(spi_v3))]
let dr = self.dr(); let dr = self.dr();
@@ -938,7 +932,7 @@ pub(crate) mod sealed {
use super::*; use super::*;
pub trait Instance { pub trait Instance {
fn regs() -> &'static crate::pac::spi::Spi; const REGS: Regs;
} }
pub trait Word: Copy + 'static { pub trait Word: Copy + 'static {
@@ -1016,9 +1010,7 @@ dma_trait!(TxDma, Instance);
foreach_peripheral!( foreach_peripheral!(
(spi, $inst:ident) => { (spi, $inst:ident) => {
impl sealed::Instance for peripherals::$inst { impl sealed::Instance for peripherals::$inst {
fn regs() -> &'static crate::pac::spi::Spi { const REGS: Regs = crate::pac::$inst;
&crate::pac::$inst
}
} }
impl Instance for peripherals::$inst {} impl Instance for peripherals::$inst {}