diff options
| author |  bors[bot] <26634292+bors[bot]@users.noreply.github.com>
| 2021-09-14 17:17:33 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2021-09-14 17:17:33 +0000 |
| commit | bf9df9fe73e9c1442a7a31ae93a91e7a8288f6f3 (patch) | |
| tree | 66d1e39353d36ee64f8a47c87ed7e548f94fcc42 /src | |
| parent | f46b22f797a728b0de1a6b14141c12ae1f016f8f (diff) | |
| parent | addb08607007aac915ac33984a1816a5aa353ced (diff) | |
| download | rtic-bf9df9fe73e9c1442a7a31ae93a91e7a8288f6f3.tar.gz rtic-bf9df9fe73e9c1442a7a31ae93a91e7a8288f6f3.tar.zst rtic-bf9df9fe73e9c1442a7a31ae93a91e7a8288f6f3.zip | |
Merge #525
525: Cleanup export and actually use rtic::export, made fn init inline r=perlindgren a=korken89
Co-authored-by: Emil Fresk <emil.fresk@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/export.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/export.rs b/src/export.rs index 927e951e..8fdcb67e 100644 --- a/src/export.rs +++ b/src/export.rs @@ -5,12 +5,10 @@ use core::{ pub use crate::tq::{NotReady, TimerQueue}; pub use bare_metal::CriticalSection; -#[cfg(armv7m)] -pub use cortex_m::register::basepri; pub use cortex_m::{ asm::wfi, interrupt, - peripheral::{scb::SystemHandler, syst::SystClkSource, DWT, NVIC}, + peripheral::{scb::SystemHandler, DWT, NVIC, SCB}, Peripherals, }; pub use heapless::sorted_linked_list::SortedLinkedList; @@ -22,6 +20,9 @@ pub type SCFQ<const N: usize> = Queue<u8, N>; pub type SCRQ<T, const N: usize> = Queue<(T, u8), N>; #[cfg(armv7m)] +use cortex_m::register::basepri; + +#[cfg(armv7m)] #[inline(always)] pub fn run<F>(priority: u8, f: F) where |