Merge pull request #239 from kalkyl/timer-ppi

Add Timer task/event endpoint getters for PPI

Author: jonas-schievink

nrf-hal-common/src/timer.rs

@@ -4,13 +4,23 @@
 
 #[cfg(feature = "9160")]
 use crate::pac::{
-    timer0_ns::RegisterBlock as RegBlock0, Interrupt, TIMER0_NS as TIMER0, TIMER1_NS as TIMER1,
-    TIMER2_NS as TIMER2,
+    generic::Reg,
+    timer0_ns::{
+        RegisterBlock as RegBlock0, _EVENTS_COMPARE, _TASKS_CAPTURE, _TASKS_CLEAR, _TASKS_COUNT,
+        _TASKS_START, _TASKS_STOP,
+    },
+    Interrupt, TIMER0_NS as TIMER0, TIMER1_NS as TIMER1, TIMER2_NS as TIMER2,
 };
 
 #[cfg(not(feature = "9160"))]
-use crate::pac::{timer0::RegisterBlock as RegBlock0, Interrupt, TIMER0, TIMER1, TIMER2};
-
+use crate::pac::{
+    generic::Reg,
+    timer0::{
+        RegisterBlock as RegBlock0, _EVENTS_COMPARE, _TASKS_CAPTURE, _TASKS_CLEAR, _TASKS_COUNT,
+        _TASKS_START, _TASKS_STOP,
+    },
+    Interrupt, TIMER0, TIMER1, TIMER2,
+};
 use cast::u32;
 use embedded_hal::{
     blocking::delay::{DelayMs, DelayUs},
@@ -25,12 +35,16 @@ use crate::pac::{TIMER3, TIMER4};
 
 // The 832 and 840 expose TIMER3 and TIMER for as timer3::RegisterBlock...
 #[cfg(any(feature = "52832", feature = "52840"))]
-use crate::pac::timer3::RegisterBlock as RegBlock3;
+use crate::pac::timer3::{
+    RegisterBlock as RegBlock3, _EVENTS_COMPARE as EventsCompare3, _TASKS_CAPTURE as TasksCapture3,
+};
 
 // ...but the 833 exposes them as timer0::RegisterBlock. This might be a bug
 // in the PAC, and could be fixed later. For now, it is equivalent anyway.
 #[cfg(feature = "52833")]
-use crate::pac::timer0::RegisterBlock as RegBlock3;
+use crate::pac::timer0::{
+    RegisterBlock as RegBlock3, _EVENTS_COMPARE as EventsCompare3, _TASKS_CAPTURE as TasksCapture3,
+};
 
 use core::marker::PhantomData;
 
@@ -135,6 +149,94 @@ where
             Err(x) => unreachable(x),
         }
     }
+
+    /// Returns reference to the `START` task endpoint for PPI.
+    /// Starts timer.
+    #[inline(always)]
+    pub fn task_start(&self) -> &Reg<u32, _TASKS_START> {
+        &self.0.as_timer0().tasks_start
+    }
+
+    /// Returns reference to the `STOP` task endpoint for PPI.
+    /// Stops timer.
+    #[inline(always)]
+    pub fn task_stop(&self) -> &Reg<u32, _TASKS_STOP> {
+        &self.0.as_timer0().tasks_stop
+    }
+
+    /// Returns reference to the `COUNT` task endpoint for PPI.
+    /// Increments timer (counter mode only).
+    #[inline(always)]
+    pub fn task_count(&self) -> &Reg<u32, _TASKS_COUNT> {
+        &self.0.as_timer0().tasks_count
+    }
+
+    /// Returns reference to the `CLEAR` task endpoint for PPI.
+    /// Clears timer.
+    #[inline(always)]
+    pub fn task_clear(&self) -> &Reg<u32, _TASKS_CLEAR> {
+        &self.0.as_timer0().tasks_clear
+    }
+
+    /// Returns reference to the CC[0] `CAPTURE` task endpoint for PPI.
+    /// Captures timer value to the CC[0] register.
+    #[inline(always)]
+    pub fn task_capture_cc0(&self) -> &Reg<u32, _TASKS_CAPTURE> {
+        &self.0.as_timer0().tasks_capture[0]
+    }
+
+    /// Returns reference to the CC[1] `CAPTURE` task endpoint for PPI.
+    /// Captures timer value to the CC[1] register.
+    #[inline(always)]
+    pub fn task_capture_cc1(&self) -> &Reg<u32, _TASKS_CAPTURE> {
+        &self.0.as_timer0().tasks_capture[1]
+    }
+
+    /// Returns reference to the CC[2] `CAPTURE` task endpoint for PPI.
+    /// Captures timer value to the CC[2] register.
+    #[inline(always)]
+    pub fn task_capture_cc2(&self) -> &Reg<u32, _TASKS_CAPTURE> {
+        &self.0.as_timer0().tasks_capture[2]
+    }
+
+    /// Returns reference to the CC[3] `CAPTURE` task endpoint for PPI.
+    /// Captures timer value to the CC[3] register.
+    #[inline(always)]
+    pub fn task_capture_cc3(&self) -> &Reg<u32, _TASKS_CAPTURE> {
+        &self.0.as_timer0().tasks_capture[3]
+    }
+
+    /// Returns reference to the CC[0] `COMPARE` event endpoint for PPI.
+    /// Generated when the counter is incremented and then matches the value
+    /// specified in the CC[0] register.
+    #[inline(always)]
+    pub fn event_compare_cc0(&self) -> &Reg<u32, _EVENTS_COMPARE> {
+        &self.0.as_timer0().events_compare[0]
+    }
+
+    /// Returns reference to the CC[1] `COMPARE` event endpoint for PPI.
+    /// Generated when the counter is incremented and then matches the value
+    /// specified in the CC[1] register.
+    #[inline(always)]
+    pub fn event_compare_cc1(&self) -> &Reg<u32, _EVENTS_COMPARE> {
+        &self.0.as_timer0().events_compare[1]
+    }
+
+    /// Returns reference to the CC[2] `COMPARE` event endpoint for PPI.
+    /// Generated when the counter is incremented and then matches the value
+    /// specified in the CC[2] register.
+    #[inline(always)]
+    pub fn event_compare_cc2(&self) -> &Reg<u32, _EVENTS_COMPARE> {
+        &self.0.as_timer0().events_compare[2]
+    }
+
+    /// Returns reference to the CC[3] `COMPARE` event endpoint for PPI.
+    /// Generated when the counter is incremented and then matches the value
+    /// specified in the CC[3] register.
+    #[inline(always)]
+    pub fn event_compare_cc3(&self) -> &Reg<u32, _EVENTS_COMPARE> {
+        &self.0.as_timer0().events_compare[3]
+    }
 }
 
 impl<T, U> timer::CountDown for Timer<T, U>
@@ -400,6 +502,69 @@ impl Instance for TIMER4 {
     }
 }
 
+/// Adds task- and event PPI endpoint getters for CC[4] and CC[5] on supported instances.
+#[cfg(any(feature = "52832", feature = "52833", feature = "52840"))]
+pub trait ExtendedCCTimer {
+    fn task_capture_cc4(&self) -> &Reg<u32, TasksCapture3>;
+    fn task_capture_cc5(&self) -> &Reg<u32, TasksCapture3>;
+    fn event_compare_cc4(&self) -> &Reg<u32, EventsCompare3>;
+    fn event_compare_cc5(&self) -> &Reg<u32, EventsCompare3>;
+}
+
+#[cfg(any(feature = "52832", feature = "52833", feature = "52840"))]
+impl ExtendedCCTimer for Timer<TIMER3> {
+    /// Returns reference to the CC[4] `CAPTURE` task endpoint for PPI.
+    #[inline(always)]
+    fn task_capture_cc4(&self) -> &Reg<u32, TasksCapture3> {
+        &self.0.tasks_capture[4]
+    }
+
+    /// Returns reference to the CC[5] `CAPTURE` task endpoint for PPI.
+    #[inline(always)]
+    fn task_capture_cc5(&self) -> &Reg<u32, TasksCapture3> {
+        &self.0.tasks_capture[5]
+    }
+
+    /// Returns reference to the CC[4] `COMPARE` event endpoint for PPI.
+    #[inline(always)]
+    fn event_compare_cc4(&self) -> &Reg<u32, EventsCompare3> {
+        &self.0.events_compare[4]
+    }
+
+    /// Returns reference to the CC[5] `COMPARE` event endpoint for PPI.
+    #[inline(always)]
+    fn event_compare_cc5(&self) -> &Reg<u32, EventsCompare3> {
+        &self.0.events_compare[5]
+    }
+}
+
+#[cfg(any(feature = "52832", feature = "52833", feature = "52840"))]
+impl ExtendedCCTimer for Timer<TIMER4> {
+    /// Returns reference to the CC[4] `CAPTURE` task endpoint for PPI.
+    #[inline(always)]
+    fn task_capture_cc4(&self) -> &Reg<u32, TasksCapture3> {
+        &self.0.tasks_capture[4]
+    }
+
+    /// Returns reference to the CC[5] `CAPTURE` task endpoint for PPI.
+    #[inline(always)]
+    fn task_capture_cc5(&self) -> &Reg<u32, TasksCapture3> {
+        &self.0.tasks_capture[5]
+    }
+
+    /// Returns reference to the CC[4] `COMPARE` event endpoint for PPI.
+    #[inline(always)]
+    fn event_compare_cc4(&self) -> &Reg<u32, EventsCompare3> {
+        &self.0.events_compare[4]
+    }
+
+    /// Returns reference to the CC[5] `COMPARE` event endpoint for PPI.
+    #[inline(always)]
+    fn event_compare_cc5(&self) -> &Reg<u32, EventsCompare3> {
+        &self.0.events_compare[5]
+    }
+}
+
 mod sealed {
     pub trait Sealed {}
     impl Sealed for super::TIMER0 {}