NaxdyOrg/embassy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

FDCAN: Fix some indenting in macros

Browse source
This commit is contained in:
Corey Schuhen 2024-02-25 08:57:18 +10:00
parent a061cf3133
commit 0565098b06
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
embassy-stm32/src/can/fdcan.rs
View file

@ -929,22 +929,22 @@ macro_rules! impl_fdcan {
unsafe { peripherals::$inst::mut_state() } unsafe { peripherals::$inst::mut_state() }
} }
#[cfg(feature = "time")] #[cfg(feature = "time")]
fn calc_timestamp(ns_per_timer_tick: u64, ts_val: u16) -> Timestamp { fn calc_timestamp(ns_per_timer_tick: u64, ts_val: u16) -> Timestamp {
let now_embassy = embassy_time::Instant::now(); let now_embassy = embassy_time::Instant::now();
if ns_per_timer_tick == 0 { if ns_per_timer_tick == 0 {
return now_embassy; return now_embassy;
} }
let cantime = { Self::regs().tscv().read().tsc() }; let cantime = { Self::regs().tscv().read().tsc() };
let delta = cantime.overflowing_sub(ts_val).0 as u64; let delta = cantime.overflowing_sub(ts_val).0 as u64;
let ns = ns_per_timer_tick * delta as u64; let ns = ns_per_timer_tick * delta as u64;
now_embassy - embassy_time::Duration::from_nanos(ns) now_embassy - embassy_time::Duration::from_nanos(ns)
} }
#[cfg(not(feature = "time"))] #[cfg(not(feature = "time"))]
fn calc_timestamp(_ns_per_timer_tick: u64, ts_val: u16) -> Timestamp { fn calc_timestamp(_ns_per_timer_tick: u64, ts_val: u16) -> Timestamp {
ts_val ts_val
} }
} }