aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Jorge Aparicio <jorge@japaric.io> 2017-07-20 23:47:14 -0500
committerGravatar Jorge Aparicio <jorge@japaric.io> 2017-07-20 23:47:14 -0500
commitbf4eabf2875b1c86d5f937f1f146c2a69c820bcb (patch)
treeab0905da75b890baa6a0b064a6c1bf2f220d9a76
parentc64e7decfe77f1fe604889a5125933d60f8e121b (diff)
downloadrtic-bf4eabf2875b1c86d5f937f1f146c2a69c820bcb.tar.gz
rtic-bf4eabf2875b1c86d5f937f1f146c2a69c820bcb.tar.zst
rtic-bf4eabf2875b1c86d5f937f1f146c2a69c820bcb.zip
misc fixes
-rw-r--r--macros/src/trans.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/macros/src/trans.rs b/macros/src/trans.rs
index b5e624d0..c0ce7c03 100644
--- a/macros/src/trans.rs
+++ b/macros/src/trans.rs
@@ -130,7 +130,7 @@ fn idle(
});
rexprs.push(quote! {
- #name: ::krate::Static::ref_mut(
+ #name: ::#krate::Static::ref_mut(
&mut *::#device::#name.get(),
),
});
@@ -423,16 +423,16 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec<Tokens>) {
fn borrow<'cs>(
&'cs self,
_cs: &'cs #krate::CriticalSection,
- ) -> &'cs #krate::Static<#name> {
- unsafe { #krate::Static::ref_(&*#name.get()) }
+ ) -> &'cs #krate::Static<#device::#name> {
+ unsafe { #krate::Static::ref_(&*#device::#name.get()) }
}
fn borrow_mut<'cs>(
&'cs mut self,
_cs: &'cs #krate::CriticalSection,
- ) -> &'cs mut #krate::Static<#name> {
+ ) -> &'cs mut #krate::Static<#device::#name> {
unsafe {
- #krate::Static::ref_mut(&mut *#name.get())
+ #krate::Static::ref_mut(&mut *#device::#name.get())
}
}
@@ -443,7 +443,7 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec<Tokens>) {
) -> R
where
F: FnOnce(
- &#krate::Static<#name>,
+ &#krate::Static<#device::#name>,
&mut #krate::Threshold) -> R
{
unsafe {
@@ -465,7 +465,7 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec<Tokens>) {
) -> R
where
F: FnOnce(
- &mut #krate::Static<#name>,
+ &mut #krate::Static<#device::#name>,
&mut #krate::Threshold) -> R
{
unsafe {