diff options
| author | Henrik Tjäder <henrik@tjaders.com> | 2024-06-23 08:45:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-23 06:45:49 +0000 |
| commit | 918f9c3f13a75d6d01f283702353ebc31bf36c69 (patch) | |
| tree | ab3211474731fffee997e7a01ded708d88421133 /rtic-monotonics | |
| parent | 9aeae030e7834d164172d5d1d811cb4cbd16253c (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')
| -rw-r--r-- | rtic-monotonics/CHANGELOG.md | 1 | ||||
| -rw-r--r-- | rtic-monotonics/Cargo.toml | 2 | ||||
| -rw-r--r-- | rtic-monotonics/src/imxrt.rs | 2 | ||||
| -rw-r--r-- | rtic-monotonics/src/nrf/rtc.rs | 2 | ||||
| -rw-r--r-- | rtic-monotonics/src/nrf/timer.rs | 2 | ||||
| -rw-r--r-- | rtic-monotonics/src/stm32.rs | 2 | ||||
| -rw-r--r-- | rtic-monotonics/src/systick.rs | 6 |
7 files changed, 9 insertions, 8 deletions
diff --git a/rtic-monotonics/CHANGELOG.md b/rtic-monotonics/CHANGELOG.md index 1a42117..3000f88 100644 --- a/rtic-monotonics/CHANGELOG.md +++ b/rtic-monotonics/CHANGELOG.md @@ -17,6 +17,7 @@ For each category, *Added*, *Changed*, *Fixed* add new entries at the top! ### Changed +- Replace `atomic-polyfill` with `portable-atomic` - Rework all timers based on `rtic-time 2.0.0` - Most timer tick rates are now configurable - Tweak `build.rs` to avoid warnings in Nightly 1.78+ diff --git a/rtic-monotonics/Cargo.toml b/rtic-monotonics/Cargo.toml index 156f9b2..369de91 100644 --- a/rtic-monotonics/Cargo.toml +++ b/rtic-monotonics/Cargo.toml @@ -36,7 +36,7 @@ rustdoc-flags = ["--cfg", "docsrs"] [dependencies] rtic-time = { version = "2.0.0", path = "../rtic-time" } fugit = { version = "0.3.6" } -atomic-polyfill = "1" +portable-atomic = { version = "1" } cfg-if = "1.0.0" cortex-m = { version = "0.7.6", optional = true } critical-section = { version = "1", optional = true } diff --git a/rtic-monotonics/src/imxrt.rs b/rtic-monotonics/src/imxrt.rs index bfe6315..f413d5c 100644 --- a/rtic-monotonics/src/imxrt.rs +++ b/rtic-monotonics/src/imxrt.rs @@ -26,7 +26,7 @@ //! } //! ``` -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/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}, diff --git a/rtic-monotonics/src/stm32.rs b/rtic-monotonics/src/stm32.rs index 4952882..6b3e4c9 100644 --- a/rtic-monotonics/src/stm32.rs +++ b/rtic-monotonics/src/stm32.rs @@ -51,7 +51,7 @@ pub mod prelude { pub use fugit::{self, ExtU64, ExtU64Ceil}; } -use atomic_polyfill::{AtomicU64, Ordering}; +use portable_atomic::{AtomicU64, Ordering}; use rtic_time::{ half_period_counter::calculate_now, timer_queue::{TimerQueue, TimerQueueBackend}, diff --git a/rtic-monotonics/src/systick.rs b/rtic-monotonics/src/systick.rs index 37cc2ed..288c7dc 100644 --- a/rtic-monotonics/src/systick.rs +++ b/rtic-monotonics/src/systick.rs @@ -42,17 +42,17 @@ pub mod prelude { pub use cortex_m::peripheral::SYST; -use atomic_polyfill::Ordering; +use portable_atomic::Ordering; use rtic_time::timer_queue::TimerQueue; use crate::TimerQueueBackend; cfg_if::cfg_if! { if #[cfg(feature = "systick-64bit")] { - use atomic_polyfill::AtomicU64; + use portable_atomic::AtomicU64; static SYSTICK_CNT: AtomicU64 = AtomicU64::new(0); } else { - use atomic_polyfill::AtomicU32; + use portable_atomic::AtomicU32; static SYSTICK_CNT: AtomicU32 = AtomicU32::new(0); } } |
