diff options
| author |  bors[bot] <26634292+bors[bot]@users.noreply.github.com>
| 2020-05-05 18:09:16 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2020-05-05 18:09:16 +0000 |
| commit | 1e29ce53785d028e9ca6a51aee2f0cc5cf505635 (patch) | |
| tree | 4798c33223aa215c7fe3e4b303d80f3241fb5d88 /src/interrupt.rs | |
| parent | d677abee20eff72ad0b8d9b7a33e1f0ae9fd73a8 (diff) | |
| parent | 7e551e6978536f7889b04d754a2e890993281a94 (diff) | |
| download | cortex-m-1e29ce53785d028e9ca6a51aee2f0cc5cf505635.tar.gz cortex-m-1e29ce53785d028e9ca6a51aee2f0cc5cf505635.tar.zst cortex-m-1e29ce53785d028e9ca6a51aee2f0cc5cf505635.zip | |
Merge #210
210: Use llmv_asm! macro for inline assembly r=jonas-schievink a=stianeklund
Fixes #204
the `asm!` macro will soon be deprecated.
This changes all of the `asm!` calls to `llvm_asm!`
To my knowledge doing a direct replacement should be fine.
Co-authored-by: Stian Eklund <stian.eklund@gmail.com>
Diffstat (limited to 'src/interrupt.rs')
| -rw-r--r-- | src/interrupt.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/interrupt.rs b/src/interrupt.rs index 2d53865..4d5ef0f 100644 --- a/src/interrupt.rs +++ b/src/interrupt.rs @@ -10,7 +10,7 @@ pub fn disable() { match () { #[cfg(all(cortex_m, feature = "inline-asm"))] () => unsafe { - asm!("cpsid i" ::: "memory" : "volatile"); + llvm_asm!("cpsid i" ::: "memory" : "volatile"); }, #[cfg(all(cortex_m, not(feature = "inline-asm")))] @@ -37,7 +37,7 @@ pub fn disable() { pub unsafe fn enable() { match () { #[cfg(all(cortex_m, feature = "inline-asm"))] - () => asm!("cpsie i" ::: "memory" : "volatile"), + () => llvm_asm!("cpsie i" ::: "memory" : "volatile"), #[cfg(all(cortex_m, not(feature = "inline-asm")))] () => { |