Remove TimerExt

Author: hannobraun

boards/adafruit-nrf52-bluefruit-le/examples/blinky.rs

@@ -9,14 +9,14 @@ use adafruit_nrf52_bluefruit_le::{prelude::*, Board};
 use core::fmt::Write;
 use cortex_m_rt::{entry, exception, ExceptionFrame};
 use nb::block;
-use nrf52832_hal::Timer;
+use nrf52832_hal::timer::{self, Timer};
 
 
 #[entry]
 fn main() -> ! {
     let mut b = Board::take().unwrap();
 
-    let mut timer = b.TIMER4.constrain();
+    let mut timer = Timer::new(b.TIMER4);
 
     b.leds.red.disable();
     b.leds.blue.disable();
@@ -65,7 +65,7 @@ fn main() -> ! {
 
 fn delay<T>(timer: &mut Timer<T>, cycles: u32)
 where
-    T: TimerExt,
+    T: timer::Instance,
 {
     timer.start(cycles);
     block!(timer.wait()).unwrap();

boards/adafruit_nrf52pro/examples/blinky.rs

@@ -10,7 +10,7 @@ use panic_semihosting;
 use adafruit_nrf52pro_bsc::hal::{
     prelude::*,
     gpio::Level,
-    timer::Timer,
+    timer::{self, Timer},
 };
 use adafruit_nrf52pro_bsc::nrf52832_pac::{Peripherals};
 use adafruit_nrf52pro_bsc::Pins;
@@ -24,7 +24,7 @@ fn main() -> ! {
     let mut led1 = pins.led1.into_push_pull_output(Level::Low);
     let mut led2 = pins.led2.into_push_pull_output(Level::Low);
 
-    let mut timer = p.TIMER0.constrain();
+    let mut timer = Timer::new(p.TIMER0);
 
     // Alternately flash the red and blue leds
     loop {
@@ -39,7 +39,7 @@ fn main() -> ! {
 
 fn delay<T>(timer: &mut Timer<T>, cycles: u32)
 where
-    T: TimerExt,
+    T: timer::Instance,
 {
     timer.start(cycles);
     block!(timer.wait());

boards/nRF52-DK/examples/blinky.rs

@@ -6,15 +6,15 @@ extern crate panic_semihosting;
 extern crate nrf52_dk_bsp as dk;
 extern crate nb;
 
-use dk::{ Board, prelude::* };
+use dk::{ Board, prelude::*, nrf52832_hal::Timer };
 use rt::entry;
 use nb::block;
 
 #[entry]
 fn main() -> ! {
     let mut board = Board::take().unwrap();
 
-    let mut timer = board.TIMER0.constrain();
+    let mut timer = Timer::new(board.TIMER0);
 
     let mut led_is_on = false;
     loop {

boards/nRF52-DK/src/lib.rs

@@ -6,7 +6,7 @@
 extern crate cortex_m;
 
 extern crate cortex_m_rt;
-extern crate nrf52832_hal;
+pub extern crate nrf52832_hal;
 
 /// Exports traits that are usually needed when using this crate
 pub mod prelude {

boards/nRF52840-DK/examples/blinky.rs

@@ -10,7 +10,7 @@ use panic_semihosting;
 use nrf52840_dk_bsp::{
     hal::{
         prelude::*,
-        timer::Timer,
+        timer::{self, Timer},
     },
     Board,
 };
@@ -20,7 +20,7 @@ use nrf52840_dk_bsp::{
 fn main() -> ! {
     let mut nrf52 = Board::take().unwrap();
 
-    let mut timer = nrf52.TIMER0.constrain();
+    let mut timer = Timer::new(nrf52.TIMER0);
 
     // Alternately flash the red and blue leds
     loop {
@@ -33,7 +33,7 @@ fn main() -> ! {
 
 fn delay<T>(timer: &mut Timer<T>, cycles: u32)
 where
-    T: TimerExt,
+    T: timer::Instance,
 {
     timer.start(cycles);
     let _ = block!(timer.wait());

nrf52-hal-common/src/lib.rs

@@ -30,7 +30,6 @@ pub mod prelude {
     pub use crate::clocks::ClocksExt;
     pub use crate::gpio::GpioExt;
     pub use crate::time::U32Ext;
-    pub use crate::timer::TimerExt;
     pub use crate::twim::TwimExt;
     pub use crate::uarte::UarteExt;
 }

nrf52-hal-common/src/timer.rs

@@ -12,31 +12,6 @@ use void::{unreachable, Void};
 #[cfg(any(feature = "52832", feature = "52840"))]
 use crate::target::{TIMER3, TIMER4};
 
-pub trait TimerExt: Deref<Target = timer0::RegisterBlock> + Sized {
-    // The interrupt that belongs to this timer instance
-    const INTERRUPT: Interrupt;
-
-    fn constrain(self) -> Timer<Self>;
-}
-
-macro_rules! impl_timer_ext {
-    ($($timer:tt,)*) => {
-        $(
-            impl TimerExt for $timer {
-                const INTERRUPT: Interrupt = Interrupt::$timer;
-
-                fn constrain(self) -> Timer<Self> {
-                    Timer::new(self)
-                }
-            }
-        )*
-    }
-}
-
-impl_timer_ext!(TIMER0, TIMER1, TIMER2,);
-
-#[cfg(any(feature = "52832", feature = "52840"))]
-impl_timer_ext!(TIMER3, TIMER4,);
 
 /// Interface to a TIMER instance
 ///
@@ -46,9 +21,9 @@ pub struct Timer<T>(T);
 
 impl<T> Timer<T>
 where
-    T: TimerExt,
+    T: Instance,
 {
-    fn new(timer: T) -> Self {
+    pub fn new(timer: T) -> Self {
         timer
             .shorts
             .write(|w| w.compare0_clear().enabled().compare0_stop().enabled());
@@ -102,7 +77,7 @@ where
 
 impl<T> timer::CountDown for Timer<T>
 where
-    T: TimerExt,
+    T: Instance,
 {
     type Time = u32;
 
@@ -151,7 +126,7 @@ where
 
 impl<T> timer::Cancel for Timer<T>
 where
-    T: TimerExt,
+    T: Instance,
 {
     type Error = ();
 
@@ -162,3 +137,25 @@ where
         Ok(())
     }
 }
+
+
+/// Implemented by all `TIMER` instances
+pub trait Instance: Deref<Target = timer0::RegisterBlock> {
+    /// This interrupt associated with this RTC instance
+    const INTERRUPT: Interrupt;
+}
+
+macro_rules! impl_instance {
+    ($($name:ident,)*) => {
+        $(
+            impl Instance for $name {
+                const INTERRUPT: Interrupt = Interrupt::$name;
+            }
+        )*
+    }
+}
+
+impl_instance!(TIMER0, TIMER1, TIMER2,);
+
+#[cfg(any(feature = "52832", feature = "52840"))]
+impl_instance!(TIMER3, TIMER4,);

nrf52-hal-common/src/uarte.rs

@@ -22,7 +22,7 @@ use crate::gpio::{
     Input,
     Floating,
 };
-use crate::timer::Timer;
+use crate::timer::{self, Timer};
 
 // Re-export SVD variants to allow user to directly set values
 pub use crate::target::uarte0::{
@@ -216,7 +216,7 @@ impl<T> Uarte<T> where T: UarteExt {
         rx_buffer: &mut [u8],
         timer: &mut Timer<I>,
         cycles: u32
-    ) -> Result<(), Error> where I: TimerExt
+    ) -> Result<(), Error> where I: timer::Instance
     {
         // Start the read
         self.start_read(rx_buffer)?;

nrf52810-hal/src/lib.rs

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

nrf52840-hal/src/lib.rs

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