Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't own DWT #7

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Don't own DWT #7

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
442fc8c
don't own DWT
jordens Feb 4, 2022
32f77ac
Merge remote-tracking branch 'upstream/master' into feature/ref-dwt
jordens Feb 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@ use rtic_monotonic::Monotonic;
/// Note that the SysTick interrupt must not be disabled longer than half the
/// cycle counter overflow period (typically a couple seconds).
///
/// Note(Safety): Do not disable/enable or set/reset the DWT cycle counter.
///
/// When the `extend` feature is enabled, the cycle counter width is extended to
/// `u64` by detecting and counting overflows.
pub struct DwtSystick<const TIMER_HZ: u32> {
dwt: DWT,
systick: SYST,
#[cfg(feature = "extend")]
last: u64,
Expand All @@ -34,7 +35,7 @@ impl<const TIMER_HZ: u32> DwtSystick<TIMER_HZ> {
/// so the speed calculated at runtime and the declared speed (generic parameter
/// `TIMER_HZ`) can be compared.
#[inline(always)]
pub fn new(dcb: &mut DCB, mut dwt: DWT, mut systick: SYST, sysclk: u32) -> Self {
pub fn new(dcb: &mut DCB, dwt: &mut DWT, mut systick: SYST, sysclk: u32) -> Self {
assert!(TIMER_HZ == sysclk);

dcb.enable_trace();
Expand All @@ -50,7 +51,6 @@ impl<const TIMER_HZ: u32> DwtSystick<TIMER_HZ> {
// We do not start the counters here but in `reset()`.

DwtSystick {
dwt,
systick,
#[cfg(feature = "extend")]
last: 0,
Expand Down Expand Up @@ -98,8 +98,8 @@ impl<const TIMER_HZ: u32> Monotonic for DwtSystick<TIMER_HZ> {
self.systick.enable_counter();

// Enable and reset the cycle counter to locate the epoch.
self.dwt.enable_cycle_counter();
self.dwt.set_cycle_count(0);
(*DWT::PTR).ctrl.modify(|r| r | 1);
(*DWT::PTR).cyccnt.write(0);
}

fn set_compare(&mut self, val: Self::Instant) {
Expand Down