Merge #336

336: Spi Instance r=therealprof a=burrbull



Co-authored-by: Andrey Zgarbul <zgarbul.andrey@gmail.com>

Author: bors[bot]

CHANGELOG.md

@@ -42,7 +42,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 
-- Add `Spi::new` and deprecate `Spi:spix`, deprecate `Serial::usartx`, remove deprecated `I2c::i2cx`
+- Add `Spi::new`, `I2s::new, `spi::Instance` and deprecate `Spi:spix`,
+  deprecate `Serial::usartx`, remove deprecated `I2c::i2cx`
 - Deprecate `free` in favour of `release`
 - Clean features in `serial`, `spi`, `i2c`, `timer`
 - Internal implementation of GPIO Pin API changed to use Const Generics

examples/analog-stopwatch-with-spi-ssd1306.rs

@@ -98,7 +98,7 @@ fn main() -> ! {
     let miso = gpioe.pe5.into_alternate();
     let mosi = gpioe.pe6.into_alternate();
 
-    let spi = Spi::spi4(
+    let spi = Spi::new(
         dp.SPI4,
         (sck, miso, mosi),
         Mode {

examples/i2s-audio-out-dma.rs

@@ -126,7 +126,7 @@ fn main() -> ! {
         gpioc.pc7.into_alternate(),
         gpioc.pc12.into_alternate(),
     );
-    let hal_i2s = I2s::i2s3(dp.SPI3, i2s_pins, clocks);
+    let hal_i2s = I2s::new(dp.SPI3, i2s_pins, clocks);
     let i2s_clock = hal_i2s.input_clock();
 
     // Audio timing configuration:

examples/i2s-audio-out.rs

@@ -123,7 +123,7 @@ fn main() -> ! {
         gpioc.pc7.into_alternate(),
         gpioc.pc12.into_alternate(),
     );
-    let hal_i2s = I2s::i2s3(dp.SPI3, i2s_pins, clocks);
+    let hal_i2s = I2s::new(dp.SPI3, i2s_pins, clocks);
     let i2s_clock = hal_i2s.input_clock();
 
     // Audio timing configuration:

src/crc32.rs

@@ -8,7 +8,7 @@
 //! to calculate. This operation stalls the AHB bus for that time.
 
 use crate::pac::{CRC, RCC};
-use crate::rcc::Enable;
+use crate::rcc::{Enable, Reset};
 use core::mem::MaybeUninit;
 use core::ptr::copy_nonoverlapping;
 
@@ -25,6 +25,7 @@ impl Crc32 {
             let rcc = &(*RCC::ptr());
             // enable CRC clock.
             CRC::enable(rcc);
+            CRC::reset(rcc);
         }
 
         let mut new = Self { periph: crc };

src/delay/mod.rs

@@ -12,4 +12,11 @@ pub struct Delay<T = SYST> {
     clocks: Clocks,
 }
 
+impl<T> Delay<T> {
+    /// Releases the timer resource
+    pub fn release(self) -> T {
+        self.tim
+    }
+}
+
 mod timer;

src/delay/syst.rs

@@ -20,11 +20,6 @@ impl Delay<SYST> {
     pub fn free(self) -> SYST {
         self.release()
     }
-
-    /// Releases the system timer (SysTick) resource
-    pub fn release(self) -> SYST {
-        self.tim
-    }
 }
 
 impl DelayMs<u32> for Delay<SYST> {

src/delay/timer.rs

@@ -58,11 +58,6 @@ macro_rules! hal {
 
                     Self { tim, clocks }
                 }
-
-                /// Releases the timer resource
-                pub fn free(self) -> $TIM {
-                    self.tim
-                }
             }
 
             impl DelayUs<u32> for Delay<$TIM> {

src/gpio.rs

@@ -667,7 +667,7 @@ macro_rules! gpio {
         /// GPIO
         pub mod $gpiox {
             use crate::pac::{$GPIOX, RCC};
-            use crate::rcc::Enable;
+            use crate::rcc::{Enable, Reset};
             use super::{
                 Floating, Input,
             };
@@ -690,6 +690,7 @@ macro_rules! gpio {
 
                         // Enable clock.
                         $GPIOX::enable(rcc);
+                        $GPIOX::reset(rcc);
                     }
                     Parts {
                         $(

src/i2s.rs

@@ -5,7 +5,7 @@
 use stm32_i2s_v12x::{Instance, RegisterBlock};
 
 use crate::pac::RCC;
-use crate::rcc::{Enable, Reset};
+use crate::rcc;
 use crate::time::Hertz;
 use crate::{rcc::Clocks, spi};
 
@@ -271,6 +271,10 @@ mod ws_pins {
     }
 }
 
+pub trait I2sFreq {
+    fn i2s_freq(clocks: &Clocks) -> Hertz;
+}
+
 /// Implements Instance for I2s<$SPIX, _> and creates an I2s::$spix function to create and enable
 /// the peripheral
 ///
@@ -281,49 +285,63 @@ mod ws_pins {
 /// to this SPI peripheral (i2s_cl, i2s_apb1_clk, or i2s2_apb_clk)
 macro_rules! i2s {
     ($SPIX:ty, $i2sx:ident, $clock:ident) => {
+        impl I2sFreq for $SPIX {
+            fn i2s_freq(clocks: &Clocks) -> Hertz {
+                clocks
+                    .$clock()
+                    .expect("I2S clock input for SPI not enabled")
+            }
+        }
+
         impl<PINS> I2s<$SPIX, PINS>
         where
             PINS: Pins<$SPIX>,
         {
-            /// Creates an I2s object around an SPI peripheral and pins
-            ///
-            /// This function enables and resets the SPI peripheral, but does not configure it.
-            ///
-            /// The returned I2s object implements [stm32_i2s_v12x::Instance], so it can be used
-            /// to configure the peripheral and communicate.
-            ///
-            /// # Panics
-            ///
-            /// This function panics if the I2S clock input (from the I2S PLL or similar)
-            /// is not configured.
+            #[deprecated(since = "0.10.0", note = "Please use new instead")]
             pub fn $i2sx(spi: $SPIX, pins: PINS, clocks: Clocks) -> Self {
-                let input_clock = clocks
-                    .$clock()
-                    .expect("I2S clock input for SPI not enabled");
-                unsafe {
-                    // NOTE(unsafe) this reference will only be used for atomic writes with no side effects.
-                    let rcc = &(*RCC::ptr());
-                    // Enable clock, enable reset, clear, reset
-                    <$SPIX>::enable(rcc);
-                    <$SPIX>::reset(rcc);
-                }
-                I2s {
-                    _spi: spi,
-                    _pins: pins,
-                    input_clock,
-                }
+                Self::new(spi, pins, clocks)
             }
         }
         impl PinMck<$SPIX> for NoMasterClock {}
-        unsafe impl<PINS> Instance for I2s<$SPIX, PINS>
-        where
-            PINS: Pins<$SPIX>,
-        {
+        unsafe impl<PINS> Instance for I2s<$SPIX, PINS> {
             const REGISTERS: *mut RegisterBlock = <$SPIX>::ptr() as *mut _;
         }
     };
 }
 
+impl<SPI, PINS> I2s<SPI, PINS>
+where
+    SPI: I2sFreq + rcc::Enable + rcc::Reset,
+    PINS: Pins<SPI>,
+{
+    /// Creates an I2s object around an SPI peripheral and pins
+    ///
+    /// This function enables and resets the SPI peripheral, but does not configure it.
+    ///
+    /// The returned I2s object implements [stm32_i2s_v12x::Instance], so it can be used
+    /// to configure the peripheral and communicate.
+    ///
+    /// # Panics
+    ///
+    /// This function panics if the I2S clock input (from the I2S PLL or similar)
+    /// is not configured.
+    pub fn new(spi: SPI, pins: PINS, clocks: Clocks) -> Self {
+        let input_clock = SPI::i2s_freq(&clocks);
+        unsafe {
+            // NOTE(unsafe) this reference will only be used for atomic writes with no side effects.
+            let rcc = &(*RCC::ptr());
+            // Enable clock, enable reset, clear, reset
+            SPI::enable(rcc);
+            SPI::reset(rcc);
+        }
+        I2s {
+            _spi: spi,
+            _pins: pins,
+            input_clock,
+        }
+    }
+}
+
 // Actually define the SPI instances that can be used for I2S
 // Each one has to be split into two declarations because the F412, F413, F423, and F446
 // have two different I2S clocks while other models have only one.
@@ -396,10 +414,7 @@ pub struct I2s<I, PINS> {
     input_clock: Hertz,
 }
 
-impl<I, PINS> I2s<I, PINS>
-where
-    PINS: Pins<I>,
-{
+impl<I, PINS> I2s<I, PINS> {
     /// Returns the frequency of the clock signal that the SPI peripheral is receiving from the
     /// I2S PLL or similar source
     pub fn input_clock(&self) -> Hertz {
@@ -435,7 +450,6 @@ mod dma {
         for stm32_i2s_v12x::I2s<I2s<SPI, PINS>, MODE>
     where
         SPI: DMASet<STREAM, CHANNEL, DIR>,
-        PINS: Pins<SPI>,
     {
     }
 }