Remove SpimExt

Author: hannobraun

boards/nRF52840-DK/src/lib.rs

@@ -318,7 +318,7 @@ impl Board {
 
         // The nRF52840-DK has an 64MB SPI flash on board which can be interfaced through SPI or Quad SPI.
         // As for now, only the normal SPI mode is available, so we are using this for the interface.
-        let flash_spim = p.SPIM2.constrain(spim::Pins {
+        let flash_spim = Spim::new(p.SPIM2, spim::Pins {
             sck : pins0.p0_19.into_push_pull_output(Level::Low).degrade(),
             mosi: Some(pins0.p0_20.into_push_pull_output(Level::Low).degrade()),
             miso: Some(pins0.p0_21.into_floating_input().degrade()),

examples/spi-demo/src/main.rs

@@ -15,6 +15,7 @@ use nrf52832_hal::gpio::p0::*;
 use nrf52832_hal::gpio::Level;
 use nrf52832_hal::gpio::*;
 use nrf52832_hal::prelude::GpioExt;
+use nrf52832_hal::spim::Spim;
 
 /// SPIM demonstation code.
 /// connect a resistor between pin 22 and 23 on to feed MOSI direct back to MISO
@@ -48,7 +49,8 @@ fn main() -> ! {
         miso: Some(spimiso),
         mosi: Some(spimosi),
     };
-    let mut spi = p.SPIM2.constrain(
+    let mut spi = Spim::new(
+        p.SPIM2,
         pins,
         nrf52832_hal::spim::Frequency::K500,
         nrf52832_hal::spim::MODE_0,
@@ -59,7 +61,6 @@ fn main() -> ! {
     // Read only test vector
     let test_vec1 = *reference_data;
     let mut readbuf = [0; 255];
-    use nrf52832_hal::spim::SpimExt;
 
     // This will write 8 bytes, then shift out ORC
 

nrf52-hal-common/src/lib.rs

@@ -29,7 +29,6 @@ pub mod prelude {
 
     pub use crate::clocks::ClocksExt;
     pub use crate::gpio::GpioExt;
-    pub use crate::spim::SpimExt;
     pub use crate::time::U32Ext;
     pub use crate::timer::TimerExt;
     pub use crate::twim::TwimExt;

nrf52-hal-common/src/spim.rs

@@ -18,26 +18,6 @@ use crate::prelude::*;
 use crate::target_constants::{EASY_DMA_SIZE, FORCE_COPY_BUFFER_SIZE};
 use crate::{slice_in_ram, DmaSlice};
 
-pub trait SpimExt: Deref<Target = spim0::RegisterBlock> + Sized {
-    fn constrain(self, pins: Pins, frequency: Frequency, mode: Mode, orc: u8) -> Spim<Self>;
-}
-
-macro_rules! impl_spim_ext {
-    ($($spim:ty,)*) => {
-        $(
-            impl SpimExt for $spim {
-                fn constrain(self, pins: Pins, frequency: Frequency, mode: Mode, orc: u8) -> Spim<Self> {
-                    Spim::new(self, pins, frequency, mode, orc)
-                }
-            }
-        )*
-    }
-}
-
-impl_spim_ext!(SPIM0,);
-
-#[cfg(any(feature = "52832", feature = "52840"))]
-impl_spim_ext!(SPIM1, SPIM2,);
 
 /// Interface to a SPIM instance
 ///
@@ -49,7 +29,7 @@ pub struct Spim<T>(T);
 
 impl<T> embedded_hal::blocking::spi::Transfer<u8> for Spim<T>
 where
-    T: SpimExt,
+    T: Instance,
 {
     type Error = Error;
 
@@ -70,7 +50,7 @@ where
 
 impl<T> embedded_hal::blocking::spi::Write<u8> for Spim<T>
 where
-    T: SpimExt,
+    T: Instance,
 {
     type Error = Error;
 
@@ -96,7 +76,7 @@ where
 }
 impl<T> Spim<T>
 where
-    T: SpimExt,
+    T: Instance,
 {
     fn spi_dma_no_copy(&mut self, chunk: &[u8]) -> Result<(), Error> {
         self.do_spi_dma_transfer(DmaSlice::from_slice(chunk), DmaSlice::null())
@@ -428,3 +408,15 @@ fn ram_slice_check(slice: &[u8]) -> Result<(), Error> {
         Err(Error::DMABufferNotInDataMemory)
     }
 }
+
+
+/// Implemented by all SPIM instances
+pub trait Instance: Deref<Target = spim0::RegisterBlock> {}
+
+impl Instance for SPIM0 {}
+
+#[cfg(any(feature = "52832", feature = "52840"))]
+impl Instance for SPIM1 {}
+
+#[cfg(any(feature = "52832", feature = "52840"))]
+impl Instance for SPIM2 {}

nrf52810-hal/src/lib.rs

@@ -10,7 +10,6 @@ pub mod prelude {
 
     pub use crate::clocks::ClocksExt;
     pub use crate::gpio::GpioExt;
-    pub use crate::spim::SpimExt;
     pub use crate::time::U32Ext;
     pub use crate::timer::TimerExt;
     pub use crate::uarte::UarteExt;

nrf52840-hal/src/lib.rs

@@ -10,7 +10,6 @@ pub mod prelude {
 
     pub use crate::clocks::ClocksExt;
     pub use crate::gpio::GpioExt;
-    pub use crate::spim::SpimExt;
     pub use crate::time::U32Ext;
     pub use crate::timer::TimerExt;
     pub use crate::uarte::UarteExt;