NaxdyOrg/embassy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Track current word size in v2 and v3 also

Browse source
This commit is contained in:
Grant Miller 2021-12-06 14:24:02 -06:00
parent d51885c0eb
commit aeb69a7665
3 changed files with 29 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
embassy-stm32/src/spi/v1.rs
View file

@ -140,8 +140,8 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
T::regs().cr1().modify(|reg| { T::regs().cr1().modify(|reg| {
reg.set_spe(true); reg.set_spe(true);
}); });
self.current_word_size = word_size;
} }
self.current_word_size = word_size;
} }
#[allow(unused)] #[allow(unused)]

22
embassy-stm32/src/spi/v2.rs
View file

@ -24,6 +24,7 @@ pub struct Spi<'d, T: Instance, Tx, Rx> {
miso: Option<AnyPin>, miso: Option<AnyPin>,
txdma: Tx, txdma: Tx,
rxdma: Rx, rxdma: Rx,
current_word_size: WordSize,
phantom: PhantomData<&'d mut T>, phantom: PhantomData<&'d mut T>,
} }
@ -107,6 +108,7 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
miso, miso,
txdma, txdma,
rxdma, rxdma,
current_word_size: WordSize::EightBit,
phantom: PhantomData, 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 { unsafe {
T::regs().cr1().modify(|w| { T::regs().cr1().modify(|w| {
w.set_spe(false); w.set_spe(false);
@ -138,6 +143,7 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
w.set_spe(true); w.set_spe(true);
}); });
} }
self.current_word_size = word_size;
} }
#[allow(unused)] #[allow(unused)]
@ -150,7 +156,7 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
w.set_spe(false); w.set_spe(false);
}); });
} }
Self::set_word_size(WordSize::EightBit); self.set_word_size(WordSize::EightBit);
let request = self.txdma.request(); let request = self.txdma.request();
let dst = T::regs().dr().ptr() as *mut u8; 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); reg.set_rxdmaen(true);
}); });
} }
Self::set_word_size(WordSize::EightBit); self.set_word_size(WordSize::EightBit);
let clock_byte_count = read.len(); 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(); 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_request = self.rxdma.request();
let rx_src = T::regs().dr().ptr() as *mut u8; let rx_src = T::regs().dr().ptr() as *mut u8;
@ -365,7 +371,7 @@ impl<'d, T: Instance, Rx> embedded_hal::blocking::spi::Write<u8> for Spi<'d, T,
type Error = Error; type Error = Error;
fn write(&mut self, words: &[u8]) -> Result<(), Self::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(); let regs = T::regs();
for word in words.iter() { for word in words.iter() {
@ -381,7 +387,7 @@ impl<'d, T: Instance> embedded_hal::blocking::spi::Transfer<u8> for Spi<'d, T, N
type Error = Error; type Error = Error;
fn transfer<'w>(&mut self, words: &'w mut [u8]) -> Result<&'w [u8], Self::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(); let regs = T::regs();
for word in words.iter_mut() { for word in words.iter_mut() {
@ -397,7 +403,7 @@ impl<'d, T: Instance, Rx> embedded_hal::blocking::spi::Write<u16> for Spi<'d, T,
type Error = Error; type Error = Error;
fn write(&mut self, words: &[u16]) -> Result<(), Self::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(); let regs = T::regs();
for word in words.iter() { for word in words.iter() {
@ -413,7 +419,7 @@ impl<'d, T: Instance> embedded_hal::blocking::spi::Transfer<u16> for Spi<'d, T,
type Error = Error; type Error = Error;
fn transfer<'w>(&mut self, words: &'w mut [u16]) -> Result<&'w [u16], Self::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(); let regs = T::regs();
for word in words.iter_mut() { for word in words.iter_mut() {

22
embassy-stm32/src/spi/v3.rs
View file

@ -26,6 +26,7 @@ pub struct Spi<'d, T: Instance, Tx = NoDma, Rx = NoDma> {
miso: Option<AnyPin>, miso: Option<AnyPin>,
txdma: Tx, txdma: Tx,
rxdma: Rx, rxdma: Rx,
current_word_size: WordSize,
phantom: PhantomData<&'d mut T>, phantom: PhantomData<&'d mut T>,
} }
@ -120,6 +121,7 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
miso, miso,
txdma, txdma,
rxdma, rxdma,
current_word_size: WordSize::EightBit,
phantom: PhantomData, 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 { unsafe {
T::regs().cr1().modify(|w| { T::regs().cr1().modify(|w| {
w.set_csusp(true); w.set_csusp(true);
@ -155,6 +160,7 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
w.set_spe(true); w.set_spe(true);
}); });
} }
self.current_word_size = word_size;
} }
#[allow(unused)] #[allow(unused)]
@ -162,7 +168,7 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
where where
Tx: TxDmaChannel<T>, Tx: TxDmaChannel<T>,
{ {
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);
@ -204,7 +210,7 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
Tx: TxDmaChannel<T>, Tx: TxDmaChannel<T>,
Rx: RxDmaChannel<T>, Rx: RxDmaChannel<T>,
{ {
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);
@ -260,7 +266,7 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
{ {
assert!(read.len() >= write.len()); assert!(read.len() >= write.len());
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);
@ -336,7 +342,7 @@ impl<'d, T: Instance> embedded_hal::blocking::spi::Write<u8> for Spi<'d, T, NoDm
type Error = Error; type Error = Error;
fn write(&mut self, words: &[u8]) -> Result<(), Self::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(); let regs = T::regs();
for word in words.iter() { for word in words.iter() {
@ -384,7 +390,7 @@ impl<'d, T: Instance> embedded_hal::blocking::spi::Transfer<u8> for Spi<'d, T, N
type Error = Error; type Error = Error;
fn transfer<'w>(&mut self, words: &'w mut [u8]) -> Result<&'w [u8], Self::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(); let regs = T::regs();
for word in words.iter_mut() { for word in words.iter_mut() {
@ -441,7 +447,7 @@ impl<'d, T: Instance> embedded_hal::blocking::spi::Write<u16> for Spi<'d, T, NoD
type Error = Error; type Error = Error;
fn write(&mut self, words: &[u16]) -> Result<(), Self::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(); let regs = T::regs();
for word in words.iter() { for word in words.iter() {
@ -490,7 +496,7 @@ impl<'d, T: Instance> embedded_hal::blocking::spi::Transfer<u16> for Spi<'d, T,
type Error = Error; type Error = Error;
fn transfer<'w>(&mut self, words: &'w mut [u16]) -> Result<&'w [u16], Self::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(); let regs = T::regs();
for word in words.iter_mut() { for word in words.iter_mut() {