aboutsummaryrefslogtreecommitdiff
path: root/src/export.rs
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-09-04 07:50:13 +0000
committerGitHub <noreply@github.com>2020-09-04 07:50:13 +0000
commit7506bd8ae0ba335fc058c2138438fab5f20f6dab (patch)
treefe65b335b19171370bd6be0bd5cd6b776a1d6110 /src/export.rs
parentc5e6d1fa49e3596227a8ee8fe89e2e4f66db3169 (diff)
parentad2b80907899cc335edcebfc77ae4b4b51272b87 (diff)
Merge #355
355: Multi-core removal r=korken89 a=AfoHT Dependent on https://github.com/rtic-rs/rtic-syntax/pull/27 With the same reasoning as ^^ For now the testing is done against my rtic-syntax/multiremove-branch, but before we merge it should corrected. Co-authored-by: Henrik Tjäder <henrik@tjaders.com>
Diffstat (limited to 'src/export.rs')
-rw-r--r--src/export.rs15
1 files changed, 3 insertions, 12 deletions
diff --git a/src/export.rs b/src/export.rs
index e23b8f3..8a5d4e3 100644
--- a/src/export.rs
+++ b/src/export.rs
@@ -12,14 +12,12 @@ pub use cortex_m::{
peripheral::{scb::SystemHandler, syst::SystClkSource, DWT, NVIC},
Peripherals,
};
-use heapless::spsc::{MultiCore, SingleCore};
+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 MCFQ<N> = Queue<u8, N, u8, MultiCore>;
-pub type MCRQ<T, N> = Queue<(T, u8), N, u8, MultiCore>;
pub type SCFQ<N> = Queue<u8, N, u8, SingleCore>;
pub type SCRQ<T, N> = Queue<(T, u8), N, u8, SingleCore>;
@@ -30,7 +28,7 @@ where
F: FnOnce(),
{
if priority == 1 {
- // if the priority of this interrupt is `1` then BASEPRI can only be `0`
+ // If the priority of this interrupt is `1` then BASEPRI can only be `0`
f();
unsafe { basepri::write(0) }
} else {
@@ -82,7 +80,7 @@ impl Priority {
}
}
- // these two methods are used by `lock` (see below) but can't be used from the RTIC application
+ // These two methods are used by `lock` (see below) but can't be used from the RTIC application
#[inline(always)]
fn set(&self, value: u8) {
self.inner.set(value)
@@ -108,13 +106,6 @@ where
{
}
-#[inline(always)]
-pub fn assert_multicore<T>()
-where
- T: super::MultiCore,
-{
-}
-
#[cfg(armv7m)]
#[inline(always)]
pub unsafe fn lock<T, R>(