1 files changed, 29 insertions, 116 deletions

diff --git a/macros/src/codegen/local_resources.rs b/macros/src/codegen/local_resources.rs
index dd3cbb44..13891f93 100644
--- a/macros/src/codegen/local_resources.rs
+++ b/macros/src/codegen/local_resources.rs
@@ -1,10 +1,12 @@
 use proc_macro2::TokenStream as TokenStream2;
 use quote::quote;
-use rtic_syntax::{analyze::Ownership, ast::App};
+use rtic_syntax::ast::App;
 
 use crate::{analyze::Analysis, check::Extra, codegen::util};
 
 /// Generates `local` variables and local resource proxies
+///
+/// I.e. the `static` variables and theirs proxies.
 pub fn codegen(
     app: &App,
     analysis: &Analysis,
@@ -16,131 +18,42 @@ pub fn codegen(
     TokenStream2,
 ) {
     let mut mod_app = vec![];
-    let mut mod_resources = vec![];
+    // let mut mod_resources: _ = vec![];
 
-    for (name, res) in app.local_resources {
+    // All local resources declared in the `#[local]' struct
+    for (name, res) in &app.local_resources {
         // let expr = &res.expr; // TODO: Extract from tasks???...
         let cfgs = &res.cfgs;
         let ty = &res.ty;
-        let mangled_name = util::mark_internal_ident(&name);
+        let mangled_name = util::mark_internal_ident(&util::static_local_resource_ident(name));
 
-        {
-            // late resources in `util::link_section_uninit`
-            let section = if expr.is_none() {
-                util::link_section_uninit(true)
-            } else {
-                None
-            };
+        let ty = quote!(rtic::RacyCell<core::mem::MaybeUninit<#ty>>);
+        let expr = quote!(rtic::RacyCell::new(core::mem::MaybeUninit::uninit()));
 
-            // resource type and assigned value
-            let (ty, expr) = if let Some(expr) = expr {
-                // early resource
-                (
-                    quote!(rtic::RacyCell<#ty>),
-                    quote!(rtic::RacyCell::new(#expr)),
-                )
-            } else {
-                // late resource
-                (
-                    quote!(rtic::RacyCell<core::mem::MaybeUninit<#ty>>),
-                    quote!(rtic::RacyCell::new(core::mem::MaybeUninit::uninit())),
-                )
-            };
+        let attrs = &res.attrs;
+        // late resources in `util::link_section_uninit`
+        let section = util::link_section_uninit(true);
 
-            let attrs = &res.attrs;
-
-            // For future use
-            // let doc = format!(" RTIC internal: {}:{}", file!(), line!());
-            mod_app.push(quote!(
-                #[allow(non_upper_case_globals)]
-                // #[doc = #doc]
-                #[doc(hidden)]
-                #(#attrs)*
-                #(#cfgs)*
-                #section
-                static #mangled_name: #ty = #expr;
-            ));
-        }
-
-        let r_prop = &res.properties;
         // For future use
         // let doc = format!(" RTIC internal: {}:{}", file!(), line!());
-
-        if !r_prop.task_local && !r_prop.lock_free {
-            mod_resources.push(quote!(
-                // #[doc = #doc]
-                #[doc(hidden)]
-                #[allow(non_camel_case_types)]
-                #(#cfgs)*
-                pub struct #name<'a> {
-                    priority: &'a Priority,
-                }
-
-                #(#cfgs)*
-                impl<'a> #name<'a> {
-                    #[inline(always)]
-                    pub unsafe fn new(priority: &'a Priority) -> Self {
-                        #name { priority }
-                    }
-
-                    #[inline(always)]
-                    pub unsafe fn priority(&self) -> &Priority {
-                        self.priority
-                    }
-                }
-            ));
-
-            let (ptr, _doc) = if expr.is_none() {
-                // late resource
-                (
-                    quote!(
-                        #(#cfgs)*
-                        #mangled_name.get_mut_unchecked().as_mut_ptr()
-                    ),
-                    "late",
-                )
-            } else {
-                // early resource
-                (
-                    quote!(
-                        #(#cfgs)*
-                        #mangled_name.get_mut_unchecked()
-                    ),
-                    "early",
-                )
-            };
-
-            let ceiling = match analysis.ownerships.get(name) {
-                Some(Ownership::Owned { priority }) => *priority,
-                Some(Ownership::CoOwned { priority }) => *priority,
-                Some(Ownership::Contended { ceiling }) => *ceiling,
-                None => 0,
-            };
-
-            // For future use
-            // let doc = format!(" RTIC internal ({} resource): {}:{}", doc, file!(), line!());
-
-            mod_app.push(util::impl_mutex(
-                extra,
-                cfgs,
-                true,
-                name,
-                quote!(#ty),
-                ceiling,
-                ptr,
-            ));
-        }
+        mod_app.push(quote!(
+            #[allow(non_upper_case_globals)]
+            // #[doc = #doc]
+            #[doc(hidden)]
+            #(#attrs)*
+            #(#cfgs)*
+            #section
+            static #mangled_name: #ty = #expr;
+        ));
     }
 
-    let mod_resources = if mod_resources.is_empty() {
-        quote!()
-    } else {
-        quote!(mod resources {
-            use rtic::export::Priority;
-
-            #(#mod_resources)*
-        })
-    };
+    // let mod_resources = if mod_resources.is_empty() {
+    //     quote!()
+    // } else {
+    //     quote!(mod local_resources {
+    //         #(#mod_resources)*
+    //     })
+    // };
 
-    (mod_app, mod_resources)
+    (mod_app, TokenStream2::new())
 }