Dependency enablement trickery

1 files changed, 12 insertions, 6 deletions

diff --git a/embassy-executor/Cargo.toml b/embassy-executor/Cargo.toml
index 80b5867c9..06e12ae7e 100644
--- a/embassy-executor/Cargo.toml
+++ b/embassy-executor/Cargo.toml
@@ -46,7 +46,7 @@ flavors = [
 [package.metadata.docs.rs]
 default-target = "thumbv7em-none-eabi"
 targets = ["thumbv7em-none-eabi"]
-features = ["defmt", "arch-cortex-m", "executor-thread", "executor-interrupt"]
+features = ["defmt", "arch-cortex-m", "executor-thread", "executor-interrupt", "drs-scheduler"]
 
 [dependencies]
 defmt = { version = "1.0.1", optional = true }
@@ -76,13 +76,17 @@ js-sys = { version = "0.3", optional = true }
 # arch-avr dependencies
 avr-device = { version = "0.7.0", optional = true }
 
-[dependencies.cordyceps]
-# note: targeting v0.3.3, to be released when
+# Note: this is ONLY a dependency when the target has atomics, this is
+# used for `run_queue_atomics`. We need to be conditional because
+# cordyceps *requires* the use of atomics, so we pull it in when
+# `run_queue_atomics` would be enabled, and NOT when `run_queue_critical_section`
+# would be enabled.
+[target.'cfg(target_has_atomic="ptr")'.dependencies.cordyceps]
+# TODO: targeting v0.3.3, to be released when
 # https://github.com/hawkw/mycelium/pull/520 is merged
 version = "0.3"
 git = "https://github.com/hawkw/mycelium"
 rev = "9649db0525b9972b95937d83d52d3f51cc486281"
-optional = true
 
 [dev-dependencies]
 critical-section = { version = "1.1", features = ["std"] }
@@ -133,5 +137,7 @@ trace = ["_any_trace"]
 rtos-trace = ["_any_trace", "metadata-name", "dep:rtos-trace", "dep:embassy-time-driver"]
 _any_trace = []
 
-## Enable "Deadline Rank Scheduler"
-drs-scheduler = ["dep:cordyceps", "dep:embassy-time-driver"]
+## Enable "Deadline Rank Sorted" Scheduler, using soft-realtime "deadlines" to prioritize
+## tasks based on the remaining time before their deadline. Adds some overhead. Requires
+## hardware atomic support
+drs-scheduler = ["dep:embassy-time-driver"]