diff options
| author | Zheng Li <[email protected]> | 2024-03-02 00:21:56 +0100 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2024-03-02 00:21:56 +0100 |
| commit | 2c42463205dae7e38535fb18f58e872df99e125a (patch) | |
| tree | f70053369f5e165fcd4ecdbfbf8d616c9533a325 /embassy-executor | |
| parent | 3b9b44ea99e0f7e3abf6b139a8adfa399ad65434 (diff) | |
executor: remove portable-atomic for riscv.
Diffstat (limited to 'embassy-executor')
| -rw-r--r-- | embassy-executor/Cargo.toml | 5 | ||||
| -rw-r--r-- | embassy-executor/src/arch/riscv32.rs | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/embassy-executor/Cargo.toml b/embassy-executor/Cargo.toml index 409df0d75..431165cee 100644 --- a/embassy-executor/Cargo.toml +++ b/embassy-executor/Cargo.toml | |||
| @@ -40,8 +40,7 @@ critical-section = "1.1" | |||
| 40 | 40 | ||
| 41 | document-features = "0.2.7" | 41 | document-features = "0.2.7" |
| 42 | 42 | ||
| 43 | # needed for riscv and avr | 43 | # needed for AVR |
| 44 | # remove when https://github.com/rust-lang/rust/pull/114499 lands on stable (on 1.76) | ||
| 45 | portable-atomic = { version = "1.5", optional = true } | 44 | portable-atomic = { version = "1.5", optional = true } |
| 46 | 45 | ||
| 47 | # arch-cortex-m dependencies | 46 | # arch-cortex-m dependencies |
| @@ -78,7 +77,7 @@ arch-std = ["_arch", "critical-section/std"] | |||
| 78 | ## Cortex-M | 77 | ## Cortex-M |
| 79 | arch-cortex-m = ["_arch", "dep:cortex-m"] | 78 | arch-cortex-m = ["_arch", "dep:cortex-m"] |
| 80 | ## RISC-V 32 | 79 | ## RISC-V 32 |
| 81 | arch-riscv32 = ["_arch", "dep:portable-atomic"] | 80 | arch-riscv32 = ["_arch"] |
| 82 | ## WASM | 81 | ## WASM |
| 83 | arch-wasm = ["_arch", "dep:wasm-bindgen", "dep:js-sys"] | 82 | arch-wasm = ["_arch", "dep:wasm-bindgen", "dep:js-sys"] |
| 84 | ## AVR | 83 | ## AVR |
diff --git a/embassy-executor/src/arch/riscv32.rs b/embassy-executor/src/arch/riscv32.rs index c56f502d3..01e63a9fd 100644 --- a/embassy-executor/src/arch/riscv32.rs +++ b/embassy-executor/src/arch/riscv32.rs | |||
| @@ -6,9 +6,9 @@ pub use thread::*; | |||
| 6 | #[cfg(feature = "executor-thread")] | 6 | #[cfg(feature = "executor-thread")] |
| 7 | mod thread { | 7 | mod thread { |
| 8 | use core::marker::PhantomData; | 8 | use core::marker::PhantomData; |
| 9 | use core::sync::atomic::{AtomicBool, Ordering}; | ||
| 9 | 10 | ||
| 10 | pub use embassy_executor_macros::main_riscv as main; | 11 | pub use embassy_executor_macros::main_riscv as main; |
| 11 | use portable_atomic::{AtomicBool, Ordering}; | ||
| 12 | 12 | ||
| 13 | use crate::{raw, Spawner}; | 13 | use crate::{raw, Spawner}; |
| 14 | 14 | ||
