diff options
author | 2020-10-07 09:22:38 +1100 | |
---|---|---|
committer | 2020-10-07 09:22:38 +1100 | |
commit | f386cb63cb6d3cd6642debfb4dc1bde97b325550 (patch) | |
tree | 30b21968997f809dbbba59117db93254607fa22d /src/export.rs | |
parent | 3d6a0ea64fb2661ee1150a84425f50c18c2de9ad (diff) | |
parent | b1e1abae29591e50ebf345a2bd249a73e564cea9 (diff) | |
download | rtic-f386cb63cb6d3cd6642debfb4dc1bde97b325550.tar.gz rtic-f386cb63cb6d3cd6642debfb4dc1bde97b325550.tar.zst rtic-f386cb63cb6d3cd6642debfb4dc1bde97b325550.zip |
Merge branch 'master'
of https://github.com/rtic-rs/cortex-m-rtic
Diffstat (limited to 'src/export.rs')
-rw-r--r-- | src/export.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/export.rs b/src/export.rs index 8a5d4e3e..27f7f5fb 100644 --- a/src/export.rs +++ b/src/export.rs @@ -4,6 +4,7 @@ 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::{ @@ -15,8 +16,6 @@ pub use cortex_m::{ use heapless::spsc::SingleCore; pub use heapless::{consts, i::Queue as iQueue, spsc::Queue}; pub use heapless::{i::BinaryHeap as iBinaryHeap, BinaryHeap}; -#[cfg(feature = "heterogeneous")] -pub use microamp::shared; pub type SCFQ<N> = Queue<u8, N, u8, SingleCore>; pub type SCRQ<T, N> = Queue<(T, u8), N, u8, SingleCore>; |