From 1a49d67490e3c1b9cb640d459890f4c880a52096 Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <jorge@japaric.io>
Date: Tue, 31 Aug 2021 19:50:50 +0200
Subject: validate unused dispatchers

closes #521
---
 macros/src/codegen/pre_init.rs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'macros/src')

diff --git a/macros/src/codegen/pre_init.rs b/macros/src/codegen/pre_init.rs
index d3c4f54d..626d17a0 100644
--- a/macros/src/codegen/pre_init.rs
+++ b/macros/src/codegen/pre_init.rs
@@ -31,6 +31,13 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream
     let device = &extra.device;
     let nvic_prio_bits = quote!(#device::NVIC_PRIO_BITS);
 
+    // check that all dispatchers exists in the `Interrupt` enumeration regardless of whether
+    // they are used or not 
+    let interrupt = util::interrupt_ident();
+    for name in app.args.extern_interrupts.keys() {
+        stmts.push(quote!(let _ = #rt_err::#interrupt::#name;));
+    }
+
     let interrupt_ids = analysis.interrupts.iter().map(|(p, (id, _))| (p, id));
 
     // Unmask interrupts and set their priorities
@@ -45,8 +52,6 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream
         // Compile time assert that this priority is supported by the device
         stmts.push(quote!(let _ = [(); ((1 << #nvic_prio_bits) - #priority as usize)];));
 
-        // NOTE this also checks that the interrupt exists in the `Interrupt` enumeration
-        let interrupt = util::interrupt_ident();
         stmts.push(quote!(
             core.NVIC.set_priority(
                 #rt_err::#interrupt::#name,
@@ -100,8 +105,6 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream
                 }
             ));
         } else {
-            // NOTE this also checks that the interrupt exists in the `Interrupt` enumeration
-            let interrupt = util::interrupt_ident();
             stmts.push(quote!(
                 core.NVIC.set_priority(
                     #rt_err::#interrupt::#binds,
-- 
cgit v1.2.3


From 38bd29779eac57e6ad7961cd57702434a348e74c Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <jorge@japaric.io>
Date: Tue, 31 Aug 2021 19:53:55 +0200
Subject: style fix

---
 macros/src/codegen/pre_init.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'macros/src')

diff --git a/macros/src/codegen/pre_init.rs b/macros/src/codegen/pre_init.rs
index 626d17a0..69f16fe3 100644
--- a/macros/src/codegen/pre_init.rs
+++ b/macros/src/codegen/pre_init.rs
@@ -32,7 +32,7 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream
     let nvic_prio_bits = quote!(#device::NVIC_PRIO_BITS);
 
     // check that all dispatchers exists in the `Interrupt` enumeration regardless of whether
-    // they are used or not 
+    // they are used or not
     let interrupt = util::interrupt_ident();
     for name in app.args.extern_interrupts.keys() {
         stmts.push(quote!(let _ = #rt_err::#interrupt::#name;));
-- 
cgit v1.2.3