Remove RtcExt

Author: hannobraun

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::rtc::RtcExt;
     pub use crate::saadc::SaadcExt;
     pub use crate::spim::SpimExt;
     pub use crate::time::U32Ext;

nrf52-hal-common/src/rtc.rs

@@ -20,36 +20,18 @@ pub struct Rtc<T, M> {
     _mode: M,
 }
 
-/// An extension trait for constructing the high level interface
-pub trait RtcExt: Deref<Target = rtc0::RegisterBlock> + Sized {
-    // The interrupt that belongs to this RTC instance.
-    const INTERRUPT: Interrupt;
-
-    fn constrain(self) -> Rtc<Self, Stopped>;
-}
-
-macro_rules! impl_rtc_ext {
-    ($($rtc:ident,)*) => {
-        $(
-            impl RtcExt for $rtc {
-                const INTERRUPT: Interrupt = Interrupt::$rtc;
-
-                fn constrain(self) -> Rtc<$rtc, Stopped> {
-                    Rtc {
-                        periph: self,
-                        _mode: Stopped,
-                    }
-                }
-            }
-        )+
+impl<T> Rtc<T, Stopped>
+where
+    T: Instance,
+{
+    pub fn new(rtc: T) -> Self {
+        Rtc {
+            periph: rtc,
+            _mode: Stopped,
+        }
     }
 }
 
-impl_rtc_ext!(RTC0, RTC1,);
-
-#[cfg(not(feature = "52810"))]
-impl_rtc_ext!(RTC2,);
-
 /// Interrupts/Events that can be generated by the RTCn peripheral
 pub enum RtcInterrupt {
     Tick,
@@ -70,7 +52,7 @@ pub enum RtcCompareReg {
 
 impl<T, M> Rtc<T, M>
 where
-    T: RtcExt,
+    T: Instance,
 {
     /// Enable/start the Real Time Counter
     pub fn enable_counter(self) -> Rtc<T, Started> {
@@ -221,7 +203,7 @@ pub enum Error {
 
 impl<T> Rtc<T, Stopped>
 where
-    T: RtcExt,
+    T: Instance,
 {
     /// Set the prescaler for the RTC peripheral. 12 bits of range.
     /// fRTC = 32_768 / (`prescaler` + 1 )
@@ -235,3 +217,25 @@ where
         Ok(())
     }
 }
+
+
+/// Implemented by all RTC instances
+pub trait Instance: Deref<Target = rtc0::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!(RTC0, RTC1,);
+
+#[cfg(not(feature = "52810"))]
+impl_instance!(RTC2,);