mirror/rtic
1
0
Fork 0
mirror of https://github.com/rtic-rs/rtic.git synced 2024-11-25 21:19:35 +01:00
Code Issues Projects Releases Packages Wiki Activity

drop idle.locals

Browse source
This commit is contained in:
Jorge Aparicio 2017-07-23 20:03:59 -05:00
parent e56ab1334e
commit 03f373fb24
1 changed files with 6 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
macros/src/trans.rs
View file

@ -11,7 +11,6 @@ pub fn app(app: &App, ownerships: &Ownerships) -> Tokens {
let mut root = vec![]; let mut root = vec![];
let mut main = vec![]; let mut main = vec![];
// ::trans::check(app, &mut main);
::trans::init(app, &mut main, &mut root); ::trans::init(app, &mut main, &mut root);
::trans::idle(app, ownerships, &mut main, &mut root); ::trans::idle(app, ownerships, &mut main, &mut root);
::trans::resources(app, ownerships, &mut root); ::trans::resources(app, ownerships, &mut root);
@ -27,12 +26,6 @@ pub fn app(app: &App, ownerships: &Ownerships) -> Tokens {
quote!(#(#root)*) quote!(#(#root)*)
} }
// Check that the exceptions / interrupts are valid
// Sadly we can't do this test at expansion time. Instead we'll generate some
// code that won't compile if the interrupt name is invalid.
// fn check(app: &App, main: &mut Vec<Tokens>) {
// }
fn idle( fn idle(
app: &App, app: &App,
ownerships: &Ownerships, ownerships: &Ownerships,
@ -55,40 +48,6 @@ fn idle(
exprs.push(quote!(unsafe { &mut #krate::Threshold::new(0) })); exprs.push(quote!(unsafe { &mut #krate::Threshold::new(0) }));
} }
if !app.idle.locals.is_empty() {
let mut lexprs = vec![];
let mut lfields = vec![];
for (name, resource) in &app.idle.locals {
let expr = &resource.expr;
let ty = &resource.ty;
lfields.push(quote! {
pub #name: #krate::Static<#ty>,
});
lexprs.push(quote! {
#name: unsafe { #krate::Static::new(#expr) },
});
}
mod_items.push(quote! {
#[allow(non_snake_case)]
pub struct Locals {
#(#lfields)*
}
});
tys.push(quote!(&'static mut idle::Locals));
exprs.push(quote!(unsafe { &mut LOCALS }));
main.push(quote! {
static mut LOCALS: idle::Locals = idle::Locals {
#(#lexprs)*
};
});
}
if !app.idle.resources.is_empty() { if !app.idle.resources.is_empty() {
let device = &app.device; let device = &app.device;
@ -424,7 +383,9 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec<Tokens>) {
&'cs self, &'cs self,
_cs: &'cs #krate::CriticalSection, _cs: &'cs #krate::CriticalSection,
) -> &'cs #krate::Static<#device::#name> { ) -> &'cs #krate::Static<#device::#name> {
unsafe { #krate::Static::ref_(&*#device::#name.get()) } unsafe {
#krate::Static::ref_(&*#device::#name.get())
}
} }
fn borrow_mut<'cs>( fn borrow_mut<'cs>(
@ -432,7 +393,9 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec<Tokens>) {
_cs: &'cs #krate::CriticalSection, _cs: &'cs #krate::CriticalSection,
) -> &'cs mut #krate::Static<#device::#name> { ) -> &'cs mut #krate::Static<#device::#name> {
unsafe { unsafe {
#krate::Static::ref_mut(&mut *#device::#name.get()) #krate::Static::ref_mut(
&mut *#device::#name.get(),
)
} }
} }