aboutsummaryrefslogtreecommitdiff
path: root/examples/lm3s6965
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 /examples/lm3s6965
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 'examples/lm3s6965')
-rw-r--r--examples/lm3s6965/Cargo.lock16
-rw-r--r--examples/lm3s6965/Cargo.toml5
2 files changed, 9 insertions, 12 deletions
diff --git a/examples/lm3s6965/Cargo.lock b/examples/lm3s6965/Cargo.lock
index 848a06f..d7537dc 100644
--- a/examples/lm3s6965/Cargo.lock
+++ b/examples/lm3s6965/Cargo.lock
@@ -3,15 +3,6 @@
version = 3
[[package]]
-name = "atomic-polyfill"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4"
-dependencies = [
- "critical-section",
-]
-
-[[package]]
name = "bare-metal"
version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -309,6 +300,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"
@@ -356,10 +350,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",
]
@@ -393,10 +387,10 @@ dependencies = [
name = "rtic-monotonics"
version = "2.0.0"
dependencies = [
- "atomic-polyfill",
"cfg-if",
"cortex-m",
"fugit",
+ "portable-atomic",
"rtic-time",
]
diff --git a/examples/lm3s6965/Cargo.toml b/examples/lm3s6965/Cargo.toml
index bfa4b29..5e2cc50 100644
--- a/examples/lm3s6965/Cargo.toml
+++ b/examples/lm3s6965/Cargo.toml
@@ -30,7 +30,10 @@ features = ["exit"]
version = "0.6.0"
[features]
-test-critical-section = ["rtic/test-critical-section"]
+test-critical-section = [
+ "rtic/test-critical-section",
+ "cortex-m/critical-section-single-core",
+]
thumbv6-backend = ["rtic/thumbv6-backend"]
thumbv7-backend = ["rtic/thumbv7-backend"]
thumbv8base-backend = ["rtic/thumbv8base-backend"]