From b8c0abcea2a42bd5f0b51326505ded2cdbcfffdb Mon Sep 17 00:00:00 2001
From: Ryan Summers <ryan.summers@vertigo-designs.com>
Date: Mon, 14 Jun 2021 18:47:37 +0200
Subject: [PATCH] Updating HAL SPI usage to master version

---
 Cargo.lock            |  2 +-
 Cargo.toml            |  2 +-
 src/hardware/setup.rs | 36 ++++++++++++++++++++++++------------
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3a7f896..5164f1f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -812,7 +812,7 @@ dependencies = [
 [[package]]
 name = "stm32h7xx-hal"
 version = "0.9.0"
-source = "git+https://github.com/quartiq/stm32h7xx-hal.git?rev=b0b8a93#b0b8a930b2c3bc5fcebc2e905b4c5e13360111a5"
+source = "git+https://github.com/quartiq/stm32h7xx-hal.git?branch=master#acd47beb4b84b4dc46da3a8b68688bc8c5984604"
 dependencies = [
  "bare-metal 1.0.0",
  "cast",
diff --git a/Cargo.toml b/Cargo.toml
index 99b390e..0c4e142 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -57,7 +57,7 @@ rev = "70b0eb5"
 features = ["stm32h743v", "rt", "unproven", "ethernet", "quadspi"]
 # version = "0.9.0"
 git = "https://github.com/quartiq/stm32h7xx-hal.git"
-rev = "b0b8a93"
+branch = "master"
 
 # link.x section start/end
 [patch.crates-io.cortex-m-rt]
diff --git a/src/hardware/setup.rs b/src/hardware/setup.rs
index 515dd51..8b60e51 100644
--- a/src/hardware/setup.rs
+++ b/src/hardware/setup.rs
@@ -341,10 +341,13 @@ pub fn setup(
                 polarity: hal::spi::Polarity::IdleHigh,
                 phase: hal::spi::Phase::CaptureOnSecondTransition,
             })
-            .manage_cs()
-            .suspend_when_inactive()
-            .communication_mode(hal::spi::CommunicationMode::Receiver)
-            .cs_delay(design_parameters::ADC_SETUP_TIME);
+            .inter_word_delay(design_parameters::ADC_SETUP_TIME)
+            .hardware_cs(hal::spi::HardwareCS {
+                mode: hal::spi::HardwareCSMode::EndlessTransaction,
+                assertion_delay: design_parameters::ADC_SETUP_TIME,
+                polarity: hal::spi::Polarity::IdleHigh,
+            })
+            .communication_mode(hal::spi::CommunicationMode::Receiver);
 
             let spi: hal::spi::Spi<_, _, u16> = device.SPI2.spi(
                 (spi_sck, spi_miso, hal::spi::NoMosi),
@@ -382,10 +385,13 @@ pub fn setup(
                 polarity: hal::spi::Polarity::IdleHigh,
                 phase: hal::spi::Phase::CaptureOnSecondTransition,
             })
-            .manage_cs()
-            .suspend_when_inactive()
-            .communication_mode(hal::spi::CommunicationMode::Receiver)
-            .cs_delay(design_parameters::ADC_SETUP_TIME);
+            .inter_word_delay(design_parameters::ADC_SETUP_TIME)
+            .hardware_cs(hal::spi::HardwareCS {
+                mode: hal::spi::HardwareCSMode::EndlessTransaction,
+                assertion_delay: design_parameters::ADC_SETUP_TIME,
+                polarity: hal::spi::Polarity::IdleHigh,
+            })
+            .communication_mode(hal::spi::CommunicationMode::Receiver);
 
             let spi: hal::spi::Spi<_, _, u16> = device.SPI3.spi(
                 (spi_sck, spi_miso, hal::spi::NoMosi),
@@ -433,8 +439,11 @@ pub fn setup(
                 polarity: hal::spi::Polarity::IdleHigh,
                 phase: hal::spi::Phase::CaptureOnSecondTransition,
             })
-            .manage_cs()
-            .suspend_when_inactive()
+            .hardware_cs(hal::spi::HardwareCS {
+                mode: hal::spi::HardwareCSMode::EndlessTransaction,
+                assertion_delay: 0.0,
+                polarity: hal::spi::Polarity::IdleHigh,
+            })
             .communication_mode(hal::spi::CommunicationMode::Transmitter)
             .swap_mosi_miso();
 
@@ -465,9 +474,12 @@ pub fn setup(
                 polarity: hal::spi::Polarity::IdleHigh,
                 phase: hal::spi::Phase::CaptureOnSecondTransition,
             })
-            .manage_cs()
+            .hardware_cs(hal::spi::HardwareCS {
+                mode: hal::spi::HardwareCSMode::EndlessTransaction,
+                assertion_delay: 0.0,
+                polarity: hal::spi::Polarity::IdleHigh,
+            })
             .communication_mode(hal::spi::CommunicationMode::Transmitter)
-            .suspend_when_inactive()
             .swap_mosi_miso();
 
             device.SPI5.spi(