From addb08607007aac915ac33984a1816a5aa353ced Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Tue, 14 Sep 2021 16:13:28 +0200
Subject: Cleanup export and actually use rtic::export, made fn init inline

---
 macros/src/codegen/init.rs   | 1 +
 macros/src/codegen/module.rs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'macros/src')

diff --git a/macros/src/codegen/init.rs b/macros/src/codegen/init.rs
index b6d3f72e..2de3e734 100644
--- a/macros/src/codegen/init.rs
+++ b/macros/src/codegen/init.rs
@@ -77,6 +77,7 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> CodegenResult {
 
     let user_init = quote!(
         #(#attrs)*
+        #[inline(always)]
         #[allow(non_snake_case)]
         fn #name(#context: #name::Context) -> (#user_init_return) {
             #(#stmts)*
diff --git a/macros/src/codegen/module.rs b/macros/src/codegen/module.rs
index 4db2c0c2..17bc34d3 100644
--- a/macros/src/codegen/module.rs
+++ b/macros/src/codegen/module.rs
@@ -275,7 +275,7 @@ pub fn codegen(
                 (
                     quote!(core::mem::transmute::<_, cortex_m::peripheral::SYST>(())
                         .enable_interrupt()),
-                    quote!(cortex_m::peripheral::SCB::set_pendst()),
+                    quote!(rtic::export::SCB::set_pendst()),
                 )
             } else {
                 let rt_err = util::rt_err_ident();
-- 
cgit v1.2.3