diff options
| author | Timo Kröger <timo.kroeger@hitachienergy.com> | 2021-12-22 12:52:51 +0100 |
|---|---|---|
| committer | Timo Kröger <timo.kroeger@hitachienergy.com> | 2021-12-22 12:52:51 +0100 |
| commit | f81a201211d63a994528e69b1c5a224be9b53f85 (patch) | |
| tree | 8b9fde02b66d8b98359a0b3c3823c8c94d5def4a /nrf-softdevice | |
| parent | 6a01c4ceb7d1f1d9fc06e74e9a264037ac1159c5 (diff) | |
| download | nrf-softdevice-f81a201211d63a994528e69b1c5a224be9b53f85.zip | |
Update toolchain
Update the toolchain to match embassy.
I manually replaced `asm!` with `core::arch::asm!` in bindings because regenerating them resulted in a large diff.
Diffstat (limited to 'nrf-softdevice')
| -rw-r--r-- | nrf-softdevice/src/critical_section_impl.rs | 1 | ||||
| -rw-r--r-- | nrf-softdevice/src/lib.rs | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/nrf-softdevice/src/critical_section_impl.rs b/nrf-softdevice/src/critical_section_impl.rs index aead7bf..196c2ad 100644 --- a/nrf-softdevice/src/critical_section_impl.rs +++ b/nrf-softdevice/src/critical_section_impl.rs @@ -1,4 +1,5 @@ use crate::pac::{Interrupt, NVIC}; +use core::arch::asm; use core::sync::atomic::{compiler_fence, AtomicBool, Ordering}; #[cfg(any(feature = "nrf52810", feature = "nrf52811"))] diff --git a/nrf-softdevice/src/lib.rs b/nrf-softdevice/src/lib.rs index 614cb1f..efe8fe1 100644 --- a/nrf-softdevice/src/lib.rs +++ b/nrf-softdevice/src/lib.rs @@ -1,5 +1,4 @@ #![no_std] -#![feature(asm)] #![feature(generic_associated_types)] #![feature(type_alias_impl_trait)] #![feature(const_fn_trait_bound)] |