mirror/rtic
1
0
Fork 0
mirror of https://github.com/rtic-rs/rtic.git synced 2025-12-18 05:45:19 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix shared resource handling and extend example.

Browse source 
The extended example tests that this actually works this time.
This commit is contained in:
Jonas Schievink 2017-09-22 18:19:18 +02:00
parent 70e243694d
commit 1556948458
2 changed files with 24 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
macros/src/trans.rs
View file

@ -351,6 +351,11 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec<Tokens>) {
Ownership::Shared { ceiling } => {
if let Some(resource) = app.resources.get(name) {
let ty = &resource.ty;
let res_rvalue = if resource.expr.is_some() {
quote!(#_name)
} else {
quote!(#_name.some)
};
impl_items.push(quote! {
type Data = #ty;
@ -361,7 +366,7 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec<Tokens>) {
) -> &'cs #krate::Static<#ty> {
assert!(t.value() >= #ceiling);
unsafe { #krate::Static::ref_(&#_name) }
unsafe { #krate::Static::ref_(&#res_rvalue) }
}
fn borrow_mut<'cs>(
@ -371,7 +376,7 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec<Tokens>) {
assert!(t.value() >= #ceiling);
unsafe {
#krate::Static::ref_mut(&mut #_name)
#krate::Static::ref_mut(&mut #res_rvalue)
}
}
@ -387,7 +392,7 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec<Tokens>) {
{
unsafe {
#krate::claim(
#krate::Static::ref_(&#_name),
#krate::Static::ref_(&#res_rvalue),
#ceiling,
#device::NVIC_PRIO_BITS,
t,
@ -408,7 +413,7 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec<Tokens>) {
{
unsafe {
#krate::claim(
#krate::Static::ref_mut(&mut #_name),
#krate::Static::ref_mut(&mut #res_rvalue),
#ceiling,
#device::NVIC_PRIO_BITS,
t,