From f81a201211d63a994528e69b1c5a224be9b53f85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Kr=C3=B6ger?= Date: Wed, 22 Dec 2021 12:52:51 +0100 Subject: 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. --- nrf-softdevice/src/critical_section_impl.rs | 1 + nrf-softdevice/src/lib.rs | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'nrf-softdevice') 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)] -- cgit v1.2.3