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-mbr | |
| 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-mbr')
| -rw-r--r-- | nrf-softdevice-mbr/src/bindings.rs | 2 | ||||
| -rw-r--r-- | nrf-softdevice-mbr/src/lib.rs | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/nrf-softdevice-mbr/src/bindings.rs b/nrf-softdevice-mbr/src/bindings.rs index 633e819..f4b6504 100644 --- a/nrf-softdevice-mbr/src/bindings.rs +++ b/nrf-softdevice-mbr/src/bindings.rs @@ -620,7 +620,7 @@ fn bindgen_test_layout_sd_mbr_command_t() { #[inline(always)] pub unsafe fn sd_mbr_command(param: *mut sd_mbr_command_t) -> u32 { let ret: u32; - asm!("svc 24", + core::arch::asm!("svc 24", inout("r0") to_asm(param) => ret, lateout("r1") _, lateout("r2") _, diff --git a/nrf-softdevice-mbr/src/lib.rs b/nrf-softdevice-mbr/src/lib.rs index d5bf6e7..bdfddda 100644 --- a/nrf-softdevice-mbr/src/lib.rs +++ b/nrf-softdevice-mbr/src/lib.rs @@ -3,7 +3,6 @@ #![allow(non_upper_case_globals)] #![allow(non_snake_case)] #![allow(dead_code)] -#![feature(asm)] mod bindings; |