From 045ae2c29f2ca358a501e664ed2a7863b9a6bd59 Mon Sep 17 00:00:00 2001
From: Ulf Lilleengen <lulf@redhat.com>
Date: Tue, 23 Aug 2022 14:57:45 +0200
Subject: [PATCH] Ensure interrupt::take works without embassy-executor

Add "rtos-trace-interrupt" feature flag on embassy-macros and enable it
for embassy-executor, to ensure that the interrupt::take! macro can be
used without depending on embassy-executor.
---
 embassy-executor/Cargo.toml                   |  4 +--
 embassy-macros/Cargo.toml                     |  3 +++
 .../src/macros/cortex_m_interrupt_take.rs     | 27 ++++++++++++++-----
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/embassy-executor/Cargo.toml b/embassy-executor/Cargo.toml
index 1a611720c..409a341f0 100644
--- a/embassy-executor/Cargo.toml
+++ b/embassy-executor/Cargo.toml
@@ -31,7 +31,7 @@ nightly = []
 integrated-timers = ["dep:embassy-time"]
 
 # Trace interrupt invocations with rtos-trace.
-rtos-trace-interrupt = ["rtos-trace"]
+rtos-trace-interrupt = ["rtos-trace", "embassy-macros/rtos-trace-interrupt"]
 
 [dependencies]
 defmt = { version = "0.3", optional = true }
@@ -39,7 +39,7 @@ log = { version = "0.4.14", optional = true }
 rtos-trace = { version = "0.1.2", optional = true }
 
 futures-util = { version = "0.3.17", default-features = false }
-embassy-macros  = { version = "0.1.0", path = "../embassy-macros"}
+embassy-macros  = { version = "0.1.0", path = "../embassy-macros" }
 embassy-time  = { version = "0.1.0", path = "../embassy-time", optional = true}
 atomic-polyfill = "1.0.1"
 critical-section = "1.1"
diff --git a/embassy-macros/Cargo.toml b/embassy-macros/Cargo.toml
index 19a3e9de2..03fa79dd8 100644
--- a/embassy-macros/Cargo.toml
+++ b/embassy-macros/Cargo.toml
@@ -15,3 +15,6 @@ proc-macro = true
 [features]
 std = []
 wasm = []
+
+# Enabling this cause interrupt::take! to require embassy-executor
+rtos-trace-interrupt = []
diff --git a/embassy-macros/src/macros/cortex_m_interrupt_take.rs b/embassy-macros/src/macros/cortex_m_interrupt_take.rs
index f6e41bcb4..d30189ce3 100644
--- a/embassy-macros/src/macros/cortex_m_interrupt_take.rs
+++ b/embassy-macros/src/macros/cortex_m_interrupt_take.rs
@@ -6,6 +6,23 @@ pub fn run(name: syn::Ident) -> Result<TokenStream, TokenStream> {
     let name_interrupt = format_ident!("{}", name);
     let name_handler = format!("__EMBASSY_{}_HANDLER", name);
 
+    #[cfg(feature = "rtos-trace-interrupt")]
+    let (isr_enter, isr_exit) = (
+        quote! {
+            ::embassy_executor::rtos_trace_interrupt! {
+                ::embassy_executor::export::trace::isr_enter();
+            }
+        },
+        quote! {
+            ::embassy_executor::rtos_trace_interrupt! {
+                ::embassy_executor::export::trace::isr_exit();
+            }
+        },
+    );
+
+    #[cfg(not(feature = "rtos-trace-interrupt"))]
+    let (isr_enter, isr_exit) = (quote! {}, quote! {});
+
     let result = quote! {
         {
             #[allow(non_snake_case)]
@@ -19,13 +36,11 @@ pub fn run(name: syn::Ident) -> Result<TokenStream, TokenStream> {
                 let func = HANDLER.func.load(interrupt::_export::atomic::Ordering::Relaxed);
                 let ctx = HANDLER.ctx.load(interrupt::_export::atomic::Ordering::Relaxed);
                 let func: fn(*mut ()) = ::core::mem::transmute(func);
-                ::embassy_executor::rtos_trace_interrupt! {
-                    ::embassy_executor::export::trace::isr_enter();
-                }
+                #isr_enter
+
                 func(ctx);
-                ::embassy_executor::rtos_trace_interrupt! {
-                    ::embassy_executor::export::trace::isr_exit();
-                }
+                #isr_exit
+
             }
 
             static TAKEN: interrupt::_export::atomic::AtomicBool = interrupt::_export::atomic::AtomicBool::new(false);