From 683c11f3997bc550d5ed716ee6e3059af4a8051c Mon Sep 17 00:00:00 2001
From: Grant Miller <GrantM11235@gmail.com>
Date: Mon, 14 Mar 2022 14:55:05 -0500
Subject: [PATCH] Call `set_word_size` before disabling SPE

---
 embassy-stm32/src/spi/v1.rs | 6 +++---
 embassy-stm32/src/spi/v2.rs | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/embassy-stm32/src/spi/v1.rs b/embassy-stm32/src/spi/v1.rs
index 5dd4dc2d..33cf9c50 100644
--- a/embassy-stm32/src/spi/v1.rs
+++ b/embassy-stm32/src/spi/v1.rs
@@ -10,12 +10,12 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
     where
         Tx: TxDma<T>,
     {
+        self.set_word_size(WordSize::EightBit);
         unsafe {
             T::regs().cr1().modify(|w| {
                 w.set_spe(false);
             });
         }
-        self.set_word_size(WordSize::EightBit);
 
         let tx_request = self.txdma.request();
         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>,
         Rx: RxDma<T>,
     {
+        self.set_word_size(WordSize::EightBit);
         unsafe {
             T::regs().cr1().modify(|w| {
                 w.set_spe(false);
@@ -51,7 +52,6 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
                 reg.set_rxdmaen(true);
             });
         }
-        self.set_word_size(WordSize::EightBit);
 
         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);
         assert_eq!(rx_len, tx_len);
 
+        self.set_word_size(WordSize::EightBit);
         unsafe {
             T::regs().cr1().modify(|w| {
                 w.set_spe(false);
@@ -108,7 +109,6 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
                 reg.set_rxdmaen(true);
             });
         }
-        self.set_word_size(WordSize::EightBit);
 
         let rx_request = self.rxdma.request();
         let rx_src = T::regs().rx_ptr();
diff --git a/embassy-stm32/src/spi/v2.rs b/embassy-stm32/src/spi/v2.rs
index 3820fcac..7ffc52be 100644
--- a/embassy-stm32/src/spi/v2.rs
+++ b/embassy-stm32/src/spi/v2.rs
@@ -10,6 +10,7 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
     where
         Tx: TxDma<T>,
     {
+        self.set_word_size(WordSize::EightBit);
         unsafe {
             T::regs().cr1().modify(|w| {
                 w.set_spe(false);
@@ -20,7 +21,6 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
                 let _ = T::regs().dr().read();
             }
         }
-        self.set_word_size(WordSize::EightBit);
 
         let tx_request = self.txdma.request();
         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>,
         Rx: RxDma<T>,
     {
+        self.set_word_size(WordSize::EightBit);
         unsafe {
             T::regs().cr1().modify(|w| {
                 w.set_spe(false);
@@ -56,7 +57,6 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
                 reg.set_rxdmaen(true);
             });
         }
-        self.set_word_size(WordSize::EightBit);
 
         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);
         assert_eq!(rx_len, tx_len);
 
+        self.set_word_size(WordSize::EightBit);
         unsafe {
             T::regs().cr1().modify(|w| {
                 w.set_spe(false);
@@ -118,7 +119,6 @@ impl<'d, T: Instance, Tx, Rx> Spi<'d, T, Tx, Rx> {
                 let _ = T::regs().dr().read();
             }
         }
-        self.set_word_size(WordSize::EightBit);
 
         let rx_request = self.rxdma.request();
         let rx_src = T::regs().rx_ptr();