Removed unnecessary lifetime naming

This commit is contained in:
Cameron 2023-07-05 19:01:28 +02:00
parent 7d3eb6463a
commit 8ee2f50b8c
4 changed files with 23 additions and 23 deletions

View File

@ -221,7 +221,7 @@ impl<'d, C: Channel, T: GpioPin> InputChannel<'d, C, T> {
} }
/// Returns the IN event, for use with PPI. /// Returns the IN event, for use with PPI.
pub fn event_in(&self) -> Event { pub fn event_in(&self) -> Event<'d> {
let g = regs(); let g = regs();
Event::from_reg(&g.events_in[self.ch.number()]) Event::from_reg(&g.events_in[self.ch.number()])
} }
@ -292,21 +292,21 @@ impl<'d, C: Channel, T: GpioPin> OutputChannel<'d, C, T> {
} }
/// Returns the OUT task, for use with PPI. /// Returns the OUT task, for use with PPI.
pub fn task_out(&self) -> Task { pub fn task_out(&self) -> Task<'d> {
let g = regs(); let g = regs();
Task::from_reg(&g.tasks_out[self.ch.number()]) Task::from_reg(&g.tasks_out[self.ch.number()])
} }
/// Returns the CLR task, for use with PPI. /// Returns the CLR task, for use with PPI.
#[cfg(not(feature = "nrf51"))] #[cfg(not(feature = "nrf51"))]
pub fn task_clr(&self) -> Task { pub fn task_clr(&self) -> Task<'d> {
let g = regs(); let g = regs();
Task::from_reg(&g.tasks_clr[self.ch.number()]) Task::from_reg(&g.tasks_clr[self.ch.number()])
} }
/// Returns the SET task, for use with PPI. /// Returns the SET task, for use with PPI.
#[cfg(not(feature = "nrf51"))] #[cfg(not(feature = "nrf51"))]
pub fn task_set(&self) -> Task { pub fn task_set(&self) -> Task<'d> {
let g = regs(); let g = regs();
Task::from_reg(&g.tasks_set[self.ch.number()]) Task::from_reg(&g.tasks_set[self.ch.number()])
} }

View File

@ -96,7 +96,7 @@ impl<'d, G: Group> PpiGroup<'d, G> {
/// Get a reference to the "enable all" task. /// Get a reference to the "enable all" task.
/// ///
/// When triggered, it will enable all the channels in this group. /// When triggered, it will enable all the channels in this group.
pub fn task_enable_all<'s: 'd>(&'d self) -> Task<'s> { pub fn task_enable_all(&self) -> Task<'d> {
let n = self.g.number(); let n = self.g.number();
Task::from_reg(&regs().tasks_chg[n].en) Task::from_reg(&regs().tasks_chg[n].en)
} }
@ -104,7 +104,7 @@ impl<'d, G: Group> PpiGroup<'d, G> {
/// Get a reference to the "disable all" task. /// Get a reference to the "disable all" task.
/// ///
/// When triggered, it will disable all the channels in this group. /// When triggered, it will disable all the channels in this group.
pub fn task_disable_all<'s: 'd>(&self) -> Task<'s> { pub fn task_disable_all(&self) -> Task<'d> {
let n = self.g.number(); let n = self.g.number();
Task::from_reg(&regs().tasks_chg[n].dis) Task::from_reg(&regs().tasks_chg[n].dis)
} }

View File

@ -181,7 +181,7 @@ impl<'d, T: Instance> SequencePwm<'d, T> {
/// Returns reference to `Stopped` event endpoint for PPI. /// Returns reference to `Stopped` event endpoint for PPI.
#[inline(always)] #[inline(always)]
pub fn event_stopped(&self) -> Event { pub fn event_stopped(&self) -> Event<'d> {
let r = T::regs(); let r = T::regs();
Event::from_reg(&r.events_stopped) Event::from_reg(&r.events_stopped)
@ -189,7 +189,7 @@ impl<'d, T: Instance> SequencePwm<'d, T> {
/// Returns reference to `LoopsDone` event endpoint for PPI. /// Returns reference to `LoopsDone` event endpoint for PPI.
#[inline(always)] #[inline(always)]
pub fn event_loops_done(&self) -> Event { pub fn event_loops_done(&self) -> Event<'d> {
let r = T::regs(); let r = T::regs();
Event::from_reg(&r.events_loopsdone) Event::from_reg(&r.events_loopsdone)
@ -197,7 +197,7 @@ impl<'d, T: Instance> SequencePwm<'d, T> {
/// Returns reference to `PwmPeriodEnd` event endpoint for PPI. /// Returns reference to `PwmPeriodEnd` event endpoint for PPI.
#[inline(always)] #[inline(always)]
pub fn event_pwm_period_end(&self) -> Event { pub fn event_pwm_period_end(&self) -> Event<'d> {
let r = T::regs(); let r = T::regs();
Event::from_reg(&r.events_pwmperiodend) Event::from_reg(&r.events_pwmperiodend)
@ -205,7 +205,7 @@ impl<'d, T: Instance> SequencePwm<'d, T> {
/// Returns reference to `Seq0 End` event endpoint for PPI. /// Returns reference to `Seq0 End` event endpoint for PPI.
#[inline(always)] #[inline(always)]
pub fn event_seq_end(&self) -> Event { pub fn event_seq_end(&self) -> Event<'d> {
let r = T::regs(); let r = T::regs();
Event::from_reg(&r.events_seqend[0]) Event::from_reg(&r.events_seqend[0])
@ -213,7 +213,7 @@ impl<'d, T: Instance> SequencePwm<'d, T> {
/// Returns reference to `Seq1 End` event endpoint for PPI. /// Returns reference to `Seq1 End` event endpoint for PPI.
#[inline(always)] #[inline(always)]
pub fn event_seq1_end(&self) -> Event { pub fn event_seq1_end(&self) -> Event<'d> {
let r = T::regs(); let r = T::regs();
Event::from_reg(&r.events_seqend[1]) Event::from_reg(&r.events_seqend[1])
@ -221,7 +221,7 @@ impl<'d, T: Instance> SequencePwm<'d, T> {
/// Returns reference to `Seq0 Started` event endpoint for PPI. /// Returns reference to `Seq0 Started` event endpoint for PPI.
#[inline(always)] #[inline(always)]
pub fn event_seq0_started(&self) -> Event { pub fn event_seq0_started(&self) -> Event<'d> {
let r = T::regs(); let r = T::regs();
Event::from_reg(&r.events_seqstarted[0]) Event::from_reg(&r.events_seqstarted[0])
@ -229,7 +229,7 @@ impl<'d, T: Instance> SequencePwm<'d, T> {
/// Returns reference to `Seq1 Started` event endpoint for PPI. /// Returns reference to `Seq1 Started` event endpoint for PPI.
#[inline(always)] #[inline(always)]
pub fn event_seq1_started(&self) -> Event { pub fn event_seq1_started(&self) -> Event<'d> {
let r = T::regs(); let r = T::regs();
Event::from_reg(&r.events_seqstarted[1]) Event::from_reg(&r.events_seqstarted[1])
@ -240,7 +240,7 @@ impl<'d, T: Instance> SequencePwm<'d, T> {
/// ///
/// Interacting with the sequence while it runs puts it in an unknown state /// Interacting with the sequence while it runs puts it in an unknown state
#[inline(always)] #[inline(always)]
pub unsafe fn task_start_seq0(&self) -> Task { pub unsafe fn task_start_seq0(&self) -> Task<'d> {
let r = T::regs(); let r = T::regs();
Task::from_reg(&r.tasks_seqstart[0]) Task::from_reg(&r.tasks_seqstart[0])
@ -251,7 +251,7 @@ impl<'d, T: Instance> SequencePwm<'d, T> {
/// ///
/// Interacting with the sequence while it runs puts it in an unknown state /// Interacting with the sequence while it runs puts it in an unknown state
#[inline(always)] #[inline(always)]
pub unsafe fn task_start_seq1(&self) -> Task { pub unsafe fn task_start_seq1(&self) -> Task<'d> {
let r = T::regs(); let r = T::regs();
Task::from_reg(&r.tasks_seqstart[1]) Task::from_reg(&r.tasks_seqstart[1])
@ -262,7 +262,7 @@ impl<'d, T: Instance> SequencePwm<'d, T> {
/// ///
/// Interacting with the sequence while it runs puts it in an unknown state /// Interacting with the sequence while it runs puts it in an unknown state
#[inline(always)] #[inline(always)]
pub unsafe fn task_next_step(&self) -> Task { pub unsafe fn task_next_step(&self) -> Task<'d> {
let r = T::regs(); let r = T::regs();
Task::from_reg(&r.tasks_nextstep) Task::from_reg(&r.tasks_nextstep)
@ -273,7 +273,7 @@ impl<'d, T: Instance> SequencePwm<'d, T> {
/// ///
/// Interacting with the sequence while it runs puts it in an unknown state /// Interacting with the sequence while it runs puts it in an unknown state
#[inline(always)] #[inline(always)]
pub unsafe fn task_stop(&self) -> Task { pub unsafe fn task_stop(&self) -> Task<'d> {
let r = T::regs(); let r = T::regs();
Task::from_reg(&r.tasks_stop) Task::from_reg(&r.tasks_stop)

View File

@ -168,21 +168,21 @@ impl<'d, T: Instance> Timer<'d, T> {
/// Returns the START task, for use with PPI. /// Returns the START task, for use with PPI.
/// ///
/// When triggered, this task starts the timer. /// When triggered, this task starts the timer.
pub fn task_start<'s: 'd>(&self) -> Task<'s> { pub fn task_start(&self) -> Task<'d> {
Task::from_reg(&T::regs().tasks_start) Task::from_reg(&T::regs().tasks_start)
} }
/// Returns the STOP task, for use with PPI. /// Returns the STOP task, for use with PPI.
/// ///
/// When triggered, this task stops the timer. /// When triggered, this task stops the timer.
pub fn task_stop<'s: 'd>(&self) -> Task<'s> { pub fn task_stop(&self) -> Task<'d> {
Task::from_reg(&T::regs().tasks_stop) Task::from_reg(&T::regs().tasks_stop)
} }
/// Returns the CLEAR task, for use with PPI. /// Returns the CLEAR task, for use with PPI.
/// ///
/// When triggered, this task resets the timer's counter to 0. /// When triggered, this task resets the timer's counter to 0.
pub fn task_clear<'s: 'd>(&self) -> Task<'s> { pub fn task_clear(&self) -> Task<'d> {
Task::from_reg(&T::regs().tasks_clear) Task::from_reg(&T::regs().tasks_clear)
} }
@ -190,7 +190,7 @@ impl<'d, T: Instance> Timer<'d, T> {
/// ///
/// When triggered, this task increments the timer's counter by 1. /// When triggered, this task increments the timer's counter by 1.
/// Only works in counter mode. /// Only works in counter mode.
pub fn task_count<'s: 'd>(&self) -> Task<'s> { pub fn task_count(&self) -> Task<'d> {
Task::from_reg(&T::regs().tasks_count) Task::from_reg(&T::regs().tasks_count)
} }
@ -258,14 +258,14 @@ impl<'d, T: Instance> Cc<'d, T> {
/// Returns this CC register's CAPTURE task, for use with PPI. /// Returns this CC register's CAPTURE task, for use with PPI.
/// ///
/// When triggered, this task will capture the current value of the timer's counter in this register. /// When triggered, this task will capture the current value of the timer's counter in this register.
pub fn task_capture<'s: 'd>(&self) -> Task<'s> { pub fn task_capture(&self) -> Task<'d> {
Task::from_reg(&T::regs().tasks_capture) Task::from_reg(&T::regs().tasks_capture)
} }
/// Returns this CC register's COMPARE event, for use with PPI. /// Returns this CC register's COMPARE event, for use with PPI.
/// ///
/// This event will fire when the timer's counter reaches the value in this CC register. /// This event will fire when the timer's counter reaches the value in this CC register.
pub fn event_compare<'s: 'd>(&self) -> Event<'s> { pub fn event_compare(&self) -> Event<'d> {
Event::from_reg(&T::regs().events_compare[self.n]) Event::from_reg(&T::regs().events_compare[self.n])
} }