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

Call set_word_size before disabling SPE

Browse Source
This commit is contained in:
Grant Miller 2022-03-14 14:55:05 -05:00
parent 3ae0923d45
commit 683c11f399
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
embassy-stm32/src/spi/v1.rs
View File

@ -10,12 +10,12 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
where where
Tx: TxDma<T>, Tx: TxDma<T>,
{ {
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);
}); });
} }
self.set_word_size(WordSize::EightBit);
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();
@ -43,6 +43,7 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
Tx: TxDma<T>, Tx: TxDma<T>,
Rx: RxDma<T>, Rx: RxDma<T>,
{ {
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);
@ -51,7 +52,6 @@ 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);
let (_, clock_byte_count) = slice_ptr_parts_mut(read); let (_, clock_byte_count) = slice_ptr_parts_mut(read);
@ -100,6 +100,7 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
let (_, tx_len) = slice_ptr_parts(write); let (_, tx_len) = slice_ptr_parts(write);
assert_eq!(rx_len, tx_len); assert_eq!(rx_len, tx_len);
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);
@ -108,7 +109,6 @@ 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);
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();

6
embassy-stm32/src/spi/v2.rs
View File

@ -10,6 +10,7 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
where where
Tx: TxDma<T>, Tx: TxDma<T>,
{ {
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);
@ -20,7 +21,6 @@ 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);
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();
@ -48,6 +48,7 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
Tx: TxDma<T>, Tx: TxDma<T>,
Rx: RxDma<T>, Rx: RxDma<T>,
{ {
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);
@ -56,7 +57,6 @@ 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);
let (_, clock_byte_count) = slice_ptr_parts_mut(read); let (_, clock_byte_count) = slice_ptr_parts_mut(read);
@ -105,6 +105,7 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
let (_, tx_len) = slice_ptr_parts(write); let (_, tx_len) = slice_ptr_parts(write);
assert_eq!(rx_len, tx_len); assert_eq!(rx_len, tx_len);
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);
@ -118,7 +119,6 @@ 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);
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();