mirror of
https://github.com/rtic-rs/rtic.git
synced 2024-11-25 21:19:35 +01:00
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>
This commit is contained in:
commit
bf9df9fe73
3 changed files with 6 additions and 4 deletions
|
@ -77,6 +77,7 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> CodegenResult {
|
|||
|
||||
let user_init = quote!(
|
||||
#(#attrs)*
|
||||
#[inline(always)]
|
||||
#[allow(non_snake_case)]
|
||||
fn #name(#context: #name::Context) -> (#user_init_return) {
|
||||
#(#stmts)*
|
||||
|
|
|
@ -275,7 +275,7 @@ pub fn codegen(
|
|||
(
|
||||
quote!(core::mem::transmute::<_, cortex_m::peripheral::SYST>(())
|
||||
.enable_interrupt()),
|
||||
quote!(cortex_m::peripheral::SCB::set_pendst()),
|
||||
quote!(rtic::export::SCB::set_pendst()),
|
||||
)
|
||||
} else {
|
||||
let rt_err = util::rt_err_ident();
|
||||
|
|
|
@ -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;
|
||||
|
@ -21,6 +19,9 @@ pub use rtic_monotonic as monotonic;
|
|||
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)
|
||||
|
|
Loading…
Reference in a new issue