mirror/rtic
1
0
Fork 0
mirror of https://github.com/rtic-rs/rtic.git synced 2024-11-23 20:22:51 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge #525

Browse source 
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:
bors[bot] 2021-09-14 17:17:33 +00:00 committed by GitHub
commit bf9df9fe73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
macros/src/codegen/init.rs
View file

@ -77,6 +77,7 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> CodegenResult {
let user_init = quote!( let user_init = quote!(
#(#attrs)* #(#attrs)*
#[inline(always)]
#[allow(non_snake_case)] #[allow(non_snake_case)]
fn #name(#context: #name::Context) -> (#user_init_return) { fn #name(#context: #name::Context) -> (#user_init_return) {
#(#stmts)* #(#stmts)*

2
macros/src/codegen/module.rs
View file

@ -275,7 +275,7 @@ pub fn codegen(
( (
quote!(core::mem::transmute::<_, cortex_m::peripheral::SYST>(()) quote!(core::mem::transmute::<_, cortex_m::peripheral::SYST>(())
.enable_interrupt()), .enable_interrupt()),
quote!(cortex_m::peripheral::SCB::set_pendst()), quote!(rtic::export::SCB::set_pendst()),
) )
} else { } else {
let rt_err = util::rt_err_ident(); let rt_err = util::rt_err_ident();

7
src/export.rs
View file

@ -5,12 +5,10 @@ use core::{
pub use crate::tq::{NotReady, TimerQueue}; pub use crate::tq::{NotReady, TimerQueue};
pub use bare_metal::CriticalSection; pub use bare_metal::CriticalSection;
#[cfg(armv7m)]
pub use cortex_m::register::basepri;
pub use cortex_m::{ pub use cortex_m::{
asm::wfi, asm::wfi,
interrupt, interrupt,
peripheral::{scb::SystemHandler, syst::SystClkSource, DWT, NVIC}, peripheral::{scb::SystemHandler, DWT, NVIC, SCB},
Peripherals, Peripherals,
}; };
pub use heapless::sorted_linked_list::SortedLinkedList; 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 SCFQ<const N: usize> = Queue<u8, N>;
pub type SCRQ<T, const N: usize> = Queue<(T, u8), N>; pub type SCRQ<T, const N: usize> = Queue<(T, u8), N>;
#[cfg(armv7m)]
use cortex_m::register::basepri;
#[cfg(armv7m)] #[cfg(armv7m)]
#[inline(always)] #[inline(always)]
pub fn run<F>(priority: u8, f: F) pub fn run<F>(priority: u8, f: F)