make the init::Resources argument optional

This commit is contained in:
Jorge Aparicio 2017-07-09 16:30:04 -05:00
parent b7e43c1dbc
commit 8485a24d36

View file

@ -30,41 +30,58 @@ fn init(app: &App, main: &mut Vec<Tokens>, root: &mut Vec<Tokens>) {
let device = &app.device; let device = &app.device;
let krate = krate(); let krate = krate();
let mut fields = vec![]; let mut tys = vec![quote!(init::Peripherals)];
let mut exprs = vec![]; let mut exprs = vec![quote!(init::Peripherals::all())];
let mut lifetime = None; let mut mod_items = vec![];
for (name, resource) in &app.resources {
lifetime = Some(quote!('a));
let ty = &resource.ty; if !app.resources.is_empty() {
let mut fields = vec![];
let mut lifetime = None;
let mut rexprs = vec![];
fields.push(quote! { for (name, resource) in &app.resources {
pub #name: &'a mut #krate::Static<#ty>, lifetime = Some(quote!('a));
});
exprs.push(quote! { let ty = &resource.ty;
#name: ::#krate::Static::ref_mut(&mut *super::#name.get()),
});
}
root.push(quote! { fields.push(quote! {
#[allow(non_camel_case_types)] pub #name: &'a mut #krate::Static<#ty>,
#[allow(non_snake_case)] });
pub struct _initResources<#lifetime> {
#(#fields)* rexprs.push(quote! {
#name: ::#krate::Static::ref_mut(&mut *super::#name.get()),
});
} }
mod init { root.push(quote! {
pub use ::#device::Peripherals; #[allow(non_camel_case_types)]
#[allow(non_snake_case)]
pub struct _initResources<#lifetime> {
#(#fields)*
}
});
mod_items.push(quote! {
pub use ::_initResources as Resources; pub use ::_initResources as Resources;
impl<#lifetime> Resources<#lifetime> { impl<#lifetime> Resources<#lifetime> {
pub unsafe fn new() -> Self { pub unsafe fn new() -> Self {
Resources { Resources {
#(#exprs)* #(#rexprs)*
} }
} }
} }
});
tys.push(quote!(init::Resources));
exprs.push(quote!(init::Resources::new()));
}
root.push(quote! {
mod init {
pub use ::#device::Peripherals;
#(#mod_items)*
} }
}); });
@ -116,10 +133,10 @@ fn init(app: &App, main: &mut Vec<Tokens>, root: &mut Vec<Tokens>) {
let init = &app.init.path; let init = &app.init.path;
main.push(quote! { main.push(quote! {
// type check // type check
let init: fn(init::Peripherals, init::Resources) = #init; let init: fn(#(#tys,)*) = #init;
#krate::atomic(|_cs| unsafe { #krate::atomic(|_cs| unsafe {
init(init::Peripherals::all(), init::Resources::new()); init(#(#exprs,)*);
#(#exceptions)* #(#exceptions)*
#(#interrupts)* #(#interrupts)*