aboutsummaryrefslogtreecommitdiff
path: root/rtic-monotonics/src/nrf
diff options
context:
space:
mode:
authorHenrik Tjäder <henrik@tjaders.com>2024-06-23 08:45:49 +0200
committerGitHub <noreply@github.com>2024-06-23 06:45:49 +0000
commit918f9c3f13a75d6d01f283702353ebc31bf36c69 (patch)
treeab3211474731fffee997e7a01ded708d88421133 /rtic-monotonics/src/nrf
parent9aeae030e7834d164172d5d1d811cb4cbd16253c (diff)
Breaking change: portable-atomic (#922)
* Atomics: Replace polyfill with portable-atomic * Update Cargo.lock for examples * RTIC: portable-atomic: Update changelog * rtic-monotonics: portable-atomic: Update changelog * lm3s6965: enable critical-section when testing * xtask: Enable portable-atomic/critical-section When dealing with rtic-monotonics * rtic-monotonics: portable-atomics: Do not disable the ability to fallback --------- Co-authored-by: Emil Fresk <emil.fresk@gmail.com>
Diffstat (limited to 'rtic-monotonics/src/nrf')
-rw-r--r--rtic-monotonics/src/nrf/rtc.rs2
-rw-r--r--rtic-monotonics/src/nrf/timer.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/rtic-monotonics/src/nrf/rtc.rs b/rtic-monotonics/src/nrf/rtc.rs
index 6437f97..f76e319 100644
--- a/rtic-monotonics/src/nrf/rtc.rs
+++ b/rtic-monotonics/src/nrf/rtc.rs
@@ -61,7 +61,7 @@ pub use nrf5340_net_pac::{self as pac, RTC0_NS as RTC0, RTC1_NS as RTC1};
#[doc(hidden)]
pub use nrf9160_pac::{self as pac, RTC0_NS as RTC0, RTC1_NS as RTC1};
-use atomic_polyfill::{AtomicU32, Ordering};
+use portable_atomic::{AtomicU32, Ordering};
use rtic_time::{
half_period_counter::calculate_now,
timer_queue::{TimerQueue, TimerQueueBackend},
diff --git a/rtic-monotonics/src/nrf/timer.rs b/rtic-monotonics/src/nrf/timer.rs
index 35e3743..6bf1968 100644
--- a/rtic-monotonics/src/nrf/timer.rs
+++ b/rtic-monotonics/src/nrf/timer.rs
@@ -71,7 +71,7 @@ pub use nrf5340_net_pac::{
#[doc(hidden)]
pub use nrf9160_pac::{self as pac, TIMER0_NS as TIMER0, TIMER1_NS as TIMER1, TIMER2_NS as TIMER2};
-use atomic_polyfill::{AtomicU32, Ordering};
+use portable_atomic::{AtomicU32, Ordering};
use rtic_time::{
half_period_counter::calculate_now,
timer_queue::{TimerQueue, TimerQueueBackend},