From b2e82684707e8675f61bba01e818947ba536d3c7 Mon Sep 17 00:00:00 2001
From: Piotr Esden-Tempski <piotr@esden.net>
Date: Tue, 17 Dec 2024 14:45:52 -0800
Subject: [PATCH 1/2] stm32/(o|q)spi: command naming convention fix

The naming convention is to prefix blocking functions with blocking. As
both command implementations are blocking the async for the ospi
implementation should also be dropped.
---
 embassy-stm32/src/ospi/mod.rs | 2 +-
 embassy-stm32/src/qspi/mod.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/embassy-stm32/src/ospi/mod.rs b/embassy-stm32/src/ospi/mod.rs
index f8ef66216..38217a9a4 100644
--- a/embassy-stm32/src/ospi/mod.rs
+++ b/embassy-stm32/src/ospi/mod.rs
@@ -520,7 +520,7 @@ impl<'d, T: Instance, M: PeriMode> Ospi<'d, T, M> {
     }
 
     /// Function used to control or configure the target device without data transfer
-    pub async fn command(&mut self, command: &TransferConfig) -> Result<(), OspiError> {
+    pub fn blocking_command(&mut self, command: &TransferConfig) -> Result<(), OspiError> {
         // Wait for peripheral to be free
         while T::REGS.sr().read().busy() {}
 
diff --git a/embassy-stm32/src/qspi/mod.rs b/embassy-stm32/src/qspi/mod.rs
index 49836aa57..0c65d0556 100644
--- a/embassy-stm32/src/qspi/mod.rs
+++ b/embassy-stm32/src/qspi/mod.rs
@@ -148,7 +148,7 @@ impl<'d, T: Instance, M: PeriMode> Qspi<'d, T, M> {
     }
 
     /// Do a QSPI command.
-    pub fn command(&mut self, transaction: TransferConfig) {
+    pub fn blocking_command(&mut self, transaction: TransferConfig) {
         #[cfg(not(stm32h7))]
         T::REGS.cr().modify(|v| v.set_dmaen(false));
         self.setup_transaction(QspiMode::IndirectWrite, &transaction, None);

From bafcdedebe1b94a9eb35a397553ee9ecab237080 Mon Sep 17 00:00:00 2001
From: Piotr Esden-Tempski <piotr@esden.net>
Date: Tue, 17 Dec 2024 14:56:45 -0800
Subject: [PATCH 2/2] Update (q|o)spi examples.

---
 examples/stm32f7/src/bin/qspi.rs                 | 4 ++--
 examples/stm32h7b0/src/bin/ospi_memory_mapped.rs | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/stm32f7/src/bin/qspi.rs b/examples/stm32f7/src/bin/qspi.rs
index 90d319b7a..bd3287964 100644
--- a/examples/stm32f7/src/bin/qspi.rs
+++ b/examples/stm32f7/src/bin/qspi.rs
@@ -72,7 +72,7 @@ impl<I: Instance> FlashMemory<I> {
             address: None,
             dummy: DummyCycles::_0,
         };
-        self.qspi.command(transaction);
+        self.qspi.blocking_command(transaction);
     }
 
     pub fn reset_memory(&mut self) {
@@ -143,7 +143,7 @@ impl<I: Instance> FlashMemory<I> {
             dummy: DummyCycles::_0,
         };
         self.enable_write();
-        self.qspi.command(transaction);
+        self.qspi.blocking_command(transaction);
         self.wait_write_finish();
     }
 
diff --git a/examples/stm32h7b0/src/bin/ospi_memory_mapped.rs b/examples/stm32h7b0/src/bin/ospi_memory_mapped.rs
index 9c397e507..dffb740a9 100644
--- a/examples/stm32h7b0/src/bin/ospi_memory_mapped.rs
+++ b/examples/stm32h7b0/src/bin/ospi_memory_mapped.rs
@@ -223,7 +223,7 @@ impl<I: Instance> FlashMemory<I> {
             dummy: DummyCycles::_0,
             ..Default::default()
         };
-        self.ospi.command(&transaction).await.unwrap();
+        self.ospi.blocking_command(&transaction).unwrap();
     }
 
     async fn exec_command(&mut self, cmd: u8) {
@@ -238,7 +238,7 @@ impl<I: Instance> FlashMemory<I> {
             ..Default::default()
         };
         // info!("Excuting command: {:x}", transaction.instruction);
-        self.ospi.command(&transaction).await.unwrap();
+        self.ospi.blocking_command(&transaction).unwrap();
     }
 
     pub async fn reset_memory(&mut self) {
@@ -318,7 +318,7 @@ impl<I: Instance> FlashMemory<I> {
             ..Default::default()
         };
         self.enable_write().await;
-        self.ospi.command(&transaction).await.unwrap();
+        self.ospi.blocking_command(&transaction).unwrap();
         self.wait_write_finish();
     }