From 889d757ab8bcfc10caf0a7d75ffb7733a7e71ed1 Mon Sep 17 00:00:00 2001
From: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Date: Wed, 19 Jan 2022 17:29:47 +0100
Subject: stm32/spi: expose all functionality as inherent methods.

---
 examples/stm32f4/src/bin/spi.rs     | 3 +--
 examples/stm32f4/src/bin/spi_dma.rs | 3 +--
 examples/stm32h7/src/bin/spi.rs     | 3 +--
 examples/stm32l0/src/bin/spi.rs     | 3 +--
 examples/stm32l1/src/bin/spi.rs     | 3 +--
 examples/stm32l4/src/bin/spi.rs     | 3 +--
 6 files changed, 6 insertions(+), 12 deletions(-)

(limited to 'examples')

diff --git a/examples/stm32f4/src/bin/spi.rs b/examples/stm32f4/src/bin/spi.rs
index b66eb9582..6b04f1fed 100644
--- a/examples/stm32f4/src/bin/spi.rs
+++ b/examples/stm32f4/src/bin/spi.rs
@@ -10,7 +10,6 @@ use embassy_stm32::dma::NoDma;
 use embassy_stm32::gpio::{Level, Output, Speed};
 use embassy_stm32::spi::{Config, Spi};
 use embassy_stm32::time::Hertz;
-use embedded_hal::blocking::spi::Transfer;
 use example_common::*;
 
 #[entry]
@@ -35,7 +34,7 @@ fn main() -> ! {
     loop {
         let mut buf = [0x0Au8; 4];
         cs.set_low();
-        unwrap!(spi.transfer(&mut buf));
+        unwrap!(spi.blocking_transfer_in_place(&mut buf));
         cs.set_high();
         info!("xfer {=[u8]:x}", buf);
     }
diff --git a/examples/stm32f4/src/bin/spi_dma.rs b/examples/stm32f4/src/bin/spi_dma.rs
index b3bf6fc28..9171f7516 100644
--- a/examples/stm32f4/src/bin/spi_dma.rs
+++ b/examples/stm32f4/src/bin/spi_dma.rs
@@ -10,7 +10,6 @@ use embassy::executor::Spawner;
 use embassy_stm32::spi::{Config, Spi};
 use embassy_stm32::time::Hertz;
 use embassy_stm32::Peripherals;
-use embassy_traits::spi::FullDuplex;
 use example_common::*;
 use heapless::String;
 
@@ -33,7 +32,7 @@ async fn main(_spawner: Spawner, p: Peripherals) {
         let mut write: String<128> = String::new();
         let mut read = [0; 128];
         core::write!(&mut write, "Hello DMA World {}!\r\n", n).unwrap();
-        spi.read_write(&mut read[0..write.len()], write.as_bytes())
+        spi.transfer(&mut read[0..write.len()], write.as_bytes())
             .await
             .ok();
         info!("read via spi+dma: {}", from_utf8(&read).unwrap());
diff --git a/examples/stm32h7/src/bin/spi.rs b/examples/stm32h7/src/bin/spi.rs
index 0b375b0d0..17e64da79 100644
--- a/examples/stm32h7/src/bin/spi.rs
+++ b/examples/stm32h7/src/bin/spi.rs
@@ -10,7 +10,6 @@ use embassy::executor::Executor;
 use embassy::util::Forever;
 use embassy_stm32::dma::NoDma;
 use embassy_stm32::spi;
-use embedded_hal::blocking::spi::Transfer;
 use example_common::*;
 
 use core::str::from_utf8;
@@ -25,7 +24,7 @@ async fn main_task(mut spi: spi::Spi<'static, SPI3, NoDma, NoDma>) {
         let mut write: String<128> = String::new();
         core::write!(&mut write, "Hello DMA World {}!\r\n", n).unwrap();
         unsafe {
-            let result = spi.transfer(write.as_bytes_mut());
+            let result = spi.blocking_transfer_in_place(write.as_bytes_mut());
             if let Err(_) = result {
                 defmt::panic!("crap");
             }
diff --git a/examples/stm32l0/src/bin/spi.rs b/examples/stm32l0/src/bin/spi.rs
index d30bb8d7a..8d6e89d91 100644
--- a/examples/stm32l0/src/bin/spi.rs
+++ b/examples/stm32l0/src/bin/spi.rs
@@ -13,7 +13,6 @@ use embassy_stm32::dma::NoDma;
 use embassy_stm32::spi::{Config, Spi};
 use embassy_stm32::time::Hertz;
 use embassy_stm32::Peripherals;
-use embedded_hal::blocking::spi::Transfer;
 
 #[embassy::main]
 async fn main(_spawner: Spawner, p: Peripherals) {
@@ -35,7 +34,7 @@ async fn main(_spawner: Spawner, p: Peripherals) {
     loop {
         let mut buf = [0x0Au8; 4];
         cs.set_low();
-        unwrap!(spi.transfer(&mut buf));
+        unwrap!(spi.blocking_transfer_in_place(&mut buf));
         cs.set_high();
         info!("xfer {=[u8]:x}", buf);
     }
diff --git a/examples/stm32l1/src/bin/spi.rs b/examples/stm32l1/src/bin/spi.rs
index 9d1a2fc87..e97e3ebb4 100644
--- a/examples/stm32l1/src/bin/spi.rs
+++ b/examples/stm32l1/src/bin/spi.rs
@@ -13,7 +13,6 @@ use embassy_stm32::dma::NoDma;
 use embassy_stm32::spi::{Config, Spi};
 use embassy_stm32::time::Hertz;
 use embassy_stm32::Peripherals;
-use embedded_hal::blocking::spi::Transfer;
 
 #[embassy::main]
 async fn main(_spawner: Spawner, p: Peripherals) {
@@ -35,7 +34,7 @@ async fn main(_spawner: Spawner, p: Peripherals) {
     loop {
         let mut buf = [0x0Au8; 4];
         cs.set_low();
-        unwrap!(spi.transfer(&mut buf));
+        unwrap!(spi.blocking_transfer_in_place(&mut buf));
         cs.set_high();
         info!("xfer {=[u8]:x}", buf);
     }
diff --git a/examples/stm32l4/src/bin/spi.rs b/examples/stm32l4/src/bin/spi.rs
index 1b6e3946e..8567d3062 100644
--- a/examples/stm32l4/src/bin/spi.rs
+++ b/examples/stm32l4/src/bin/spi.rs
@@ -9,7 +9,6 @@ use embassy_stm32::dma::NoDma;
 use embassy_stm32::gpio::{Level, Output, Speed};
 use embassy_stm32::spi::{Config, Spi};
 use embassy_stm32::time::Hertz;
-use embedded_hal::blocking::spi::Transfer;
 use example_common::*;
 
 #[cortex_m_rt::entry]
@@ -34,7 +33,7 @@ fn main() -> ! {
     loop {
         let mut buf = [0x0Au8; 4];
         cs.set_low();
-        unwrap!(spi.transfer(&mut buf));
+        unwrap!(spi.blocking_transfer_in_place(&mut buf));
         cs.set_high();
         info!("xfer {=[u8]:x}", buf);
     }
-- 
cgit