From e7f0d9c3e3fad77dace2ce63af02559fda46cb73 Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Thu, 1 Oct 2020 19:38:49 +0200
Subject: Now late resources are always used

---
 macros/src/codegen/module.rs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'macros/src/codegen/module.rs')

diff --git a/macros/src/codegen/module.rs b/macros/src/codegen/module.rs
index 863f6c5b..85bab3ab 100644
--- a/macros/src/codegen/module.rs
+++ b/macros/src/codegen/module.rs
@@ -253,14 +253,12 @@ pub fn codegen(ctxt: Context, resources_tick: bool, app: &App, extra: &Extra) ->
 
     if let Context::Init = ctxt {
         let init = &app.inits.first().unwrap();
-        if init.returns_late_resources {
-            let late_resources = util::late_resources_ident(&init.name);
+        let late_resources = util::late_resources_ident(&init.name);
 
-            items.push(quote!(
-                #[doc(inline)]
-                pub use super::#late_resources as LateResources;
-            ));
-        }
+        items.push(quote!(
+            #[doc(inline)]
+            pub use super::#late_resources as LateResources;
+        ));
     }
 
     let doc = match ctxt {
-- 
cgit v1.2.3


From fb61a78cdd99e27914cc355f721c04d901dd3ae4 Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Thu, 1 Oct 2020 20:01:25 +0200
Subject: Added `bare_metal::CriticalSection` to `init::Context`

---
 Cargo.toml                   | 1 +
 macros/src/codegen/module.rs | 8 ++++++++
 src/export.rs                | 1 +
 3 files changed, 10 insertions(+)

(limited to 'macros/src/codegen/module.rs')

diff --git a/Cargo.toml b/Cargo.toml
index d4ad4ef0..6fe5fce3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -60,6 +60,7 @@ cortex-m-rtic-macros = { path = "macros", version = "0.5.2" }
 rtic-core = "0.3.0"
 cortex-m-rt = "0.6.9"
 heapless = "0.5.0"
+bare-metal = "1.0.0"
 
 [build-dependencies]
 version_check = "0.9"
diff --git a/macros/src/codegen/module.rs b/macros/src/codegen/module.rs
index 863f6c5b..359c1cce 100644
--- a/macros/src/codegen/module.rs
+++ b/macros/src/codegen/module.rs
@@ -47,6 +47,14 @@ pub fn codegen(ctxt: Context, resources_tick: bool, app: &App, extra: &Extra) ->
                 values.push(quote!(device: #device::Peripherals::steal()));
             }
 
+            lt = Some(quote!('a));
+            fields.push(quote!(
+                /// Critical section token for init
+                pub cs: rtic::export::CriticalSection<#lt>
+            ));
+
+            values.push(quote!(cs: rtic::export::CriticalSection::new()));
+
             values.push(quote!(core));
         }
 
diff --git a/src/export.rs b/src/export.rs
index 8a5d4e3e..1e64941f 100644
--- a/src/export.rs
+++ b/src/export.rs
@@ -4,6 +4,7 @@ use core::{
 };
 
 pub use crate::tq::{NotReady, TimerQueue};
+pub use bare_metal::CriticalSection;
 #[cfg(armv7m)]
 pub use cortex_m::register::basepri;
 pub use cortex_m::{
-- 
cgit v1.2.3