alex/rp-hal-boards
1
0
Fork 0
mirror of https://github.com/italicsjenga/rp-hal-boards.git synced 2024-12-24 05:01:31 +11:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #263 from WeirdConstructor/fix_alarm_schedule_race_cond

Browse source 
Fix alarm schedule race condition
This commit is contained in:
Jonathan 'theJPster' Pallant 2022-01-12 20:07:59 +00:00 committed by GitHub
parent f7b8abfeb0 fdc36d30cc
commit d3c9c3b4e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
rp2040-hal/src/timer.rs
View file

@ -249,17 +249,19 @@ macro_rules! impl_alarm {
if duration < MIN_MICROSECONDS { if duration < MIN_MICROSECONDS {
return Err(ScheduleAlarmError::AlarmTooSoon); return Err(ScheduleAlarmError::AlarmTooSoon);
} else { } else {
// safety: This is a read action and should not have any UB cortex_m::interrupt::free(|_| {
let target_time = unsafe { &*TIMER::ptr() } // safety: This is a read action and should not have any UB
.timelr let target_time = unsafe { &*TIMER::ptr() }
.read() .timelr
.bits() .read()
.wrapping_add(duration); .bits()
.wrapping_add(duration);
// safety: This is the only code in the codebase that accesses memory address $timer_alarm // safety: This is the only code in the codebase that accesses memory address $timer_alarm
unsafe { &*TIMER::ptr() } unsafe { &*TIMER::ptr() }
.$timer_alarm .$timer_alarm
.write(|w| unsafe { w.bits(target_time) }); .write(|w| unsafe { w.bits(target_time) });
});
Ok(()) Ok(())
} }
} }