From 918f9c3f13a75d6d01f283702353ebc31bf36c69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= Date: Sun, 23 Jun 2024 08:45:49 +0200 Subject: 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 --- examples/rp2040_local_i2c_init/Cargo.lock | 17 ++++++----------- examples/rp2040_local_i2c_init/Cargo.toml | 1 + 2 files changed, 7 insertions(+), 11 deletions(-) (limited to 'examples/rp2040_local_i2c_init') diff --git a/examples/rp2040_local_i2c_init/Cargo.lock b/examples/rp2040_local_i2c_init/Cargo.lock index 66666f8..38df88d 100644 --- a/examples/rp2040_local_i2c_init/Cargo.lock +++ b/examples/rp2040_local_i2c_init/Cargo.lock @@ -8,15 +8,6 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" -[[package]] -name = "atomic-polyfill" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c314e70d181aa6053b26e3f7fbf86d1dfff84f816a6175b967666b3506ef7289" -dependencies = [ - "critical-section", -] - [[package]] name = "bare-metal" version = "0.2.5" @@ -371,6 +362,9 @@ name = "portable-atomic" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +dependencies = [ + "critical-section", +] [[package]] name = "proc-macro-error" @@ -503,6 +497,7 @@ dependencies = [ "embedded-hal 0.2.7", "fugit", "panic-probe", + "portable-atomic", "rp-pico", "rtic", "rtic-monotonics", @@ -512,10 +507,10 @@ dependencies = [ name = "rtic" version = "2.1.1" dependencies = [ - "atomic-polyfill", "bare-metal 1.0.0", "cortex-m", "critical-section", + "portable-atomic", "rtic-core", "rtic-macros", ] @@ -549,10 +544,10 @@ dependencies = [ name = "rtic-monotonics" version = "2.0.0" dependencies = [ - "atomic-polyfill", "cfg-if", "cortex-m", "fugit", + "portable-atomic", "rp2040-pac", "rtic-time", ] diff --git a/examples/rp2040_local_i2c_init/Cargo.toml b/examples/rp2040_local_i2c_init/Cargo.toml index 2f893dc..986977d 100644 --- a/examples/rp2040_local_i2c_init/Cargo.toml +++ b/examples/rp2040_local_i2c_init/Cargo.toml @@ -24,6 +24,7 @@ embedded-hal = { version = "0.2.7", features = ["unproven"] } fugit = "0.3" rp-pico = "0.9.0" panic-probe = "0.3" +portable-atomic = { version = "1", features = ["critical-section"] } [profile.dev] opt-level = 1 -- cgit v1.2.3