3 files changed, 58 insertions, 31 deletions

diff --git a/embassy-nrf/src/lib.rs b/embassy-nrf/src/lib.rs
index 03d3ca5f7..430b6fae7 100644
--- a/embassy-nrf/src/lib.rs
+++ b/embassy-nrf/src/lib.rs
@@ -177,34 +177,43 @@ mod chip;
 // developer note: this macro can't be in `embassy-hal-internal` due to the use of `$crate`.
 #[macro_export]
 macro_rules! bind_interrupts {
-        ($vis:vis struct $name:ident {
-            $(
-                $(#[cfg($cond_irq:meta)])?
-                $irq:ident => $(
-                    $(#[cfg($cond_handler:meta)])?
-                    $handler:ty
-                ),*;
-            )*
-        }) => {
-            #[derive(Copy, Clone)]
-            $vis struct $name;
-
-            $(
-                #[allow(non_snake_case)]
-                #[no_mangle]
-                $(#[cfg($cond_irq)])?
-                unsafe extern "C" fn $irq() {
-                    $(
-                        $(#[cfg($cond_handler)])?
-                        <$handler as $crate::interrupt::typelevel::Handler<$crate::interrupt::typelevel::$irq>>::on_interrupt();
-
-                        $(#[cfg($cond_handler)])?
-                        unsafe impl $crate::interrupt::typelevel::Binding<$crate::interrupt::typelevel::$irq, $handler> for $name {}
-                    )*
-                }
-            )*
-        };
+    ($vis:vis struct $name:ident {
+        $(
+            $(#[cfg($cond_irq:meta)])?
+            $irq:ident => $(
+                $(#[cfg($cond_handler:meta)])?
+                $handler:ty
+            ),*;
+        )*
+    }) => {
+        #[derive(Copy, Clone)]
+        $vis struct $name;
+
+        $(
+            #[allow(non_snake_case)]
+            #[no_mangle]
+            $(#[cfg($cond_irq)])?
+            unsafe extern "C" fn $irq() {
+                $(
+                    $(#[cfg($cond_handler)])?
+                    <$handler as $crate::interrupt::typelevel::Handler<$crate::interrupt::typelevel::$irq>>::on_interrupt();
+
+                )*
+            }
+
+            $(#[cfg($cond_irq)])?
+            $crate::bind_interrupts!(@inner
+                $(
+                    $(#[cfg($cond_handler)])?
+                    unsafe impl $crate::interrupt::typelevel::Binding<$crate::interrupt::typelevel::$irq, $handler> for $name {}
+                )*
+            );
+        )*
+    };
+    (@inner $($t:tt)*) => {
+        $($t)*
     }
+}
 
 // Reexports
 
diff --git a/embassy-rp/src/lib.rs b/embassy-rp/src/lib.rs
index 51f6ed7f8..f0893b5a0 100644
--- a/embassy-rp/src/lib.rs
+++ b/embassy-rp/src/lib.rs
@@ -175,8 +175,8 @@ macro_rules! bind_interrupts {
             ),*;
         )*
     }) => {
-            #[derive(Copy, Clone)]
-            $vis struct $name;
+        #[derive(Copy, Clone)]
+        $vis struct $name;
 
         $(
             #[allow(non_snake_case)]
@@ -187,12 +187,21 @@ macro_rules! bind_interrupts {
                     $(#[cfg($cond_handler)])?
                     <$handler as $crate::interrupt::typelevel::Handler<$crate::interrupt::typelevel::$irq>>::on_interrupt();
 
+                )*
+            }
+
+            $(#[cfg($cond_irq)])?
+            $crate::bind_interrupts!(@inner
+                $(
                     $(#[cfg($cond_handler)])?
                     unsafe impl $crate::interrupt::typelevel::Binding<$crate::interrupt::typelevel::$irq, $handler> for $name {}
                 )*
-            }
+            );
         )*
     };
+    (@inner $($t:tt)*) => {
+        $($t)*
+    }
 }
 
 #[cfg(feature = "rp2040")]
diff --git a/embassy-stm32/src/lib.rs b/embassy-stm32/src/lib.rs
index 1e6185bc1..286a18da2 100644
--- a/embassy-stm32/src/lib.rs
+++ b/embassy-stm32/src/lib.rs
@@ -186,12 +186,21 @@ macro_rules! bind_interrupts {
                     $(#[cfg($cond_handler)])?
                     <$handler as $crate::interrupt::typelevel::Handler<$crate::interrupt::typelevel::$irq>>::on_interrupt();
 
+                )*
+            }
+
+            $(#[cfg($cond_irq)])?
+            $crate::bind_interrupts!(@inner
+                $(
                     $(#[cfg($cond_handler)])?
                     unsafe impl $crate::interrupt::typelevel::Binding<$crate::interrupt::typelevel::$irq, $handler> for $name {}
                 )*
-            }
+            );
         )*
     };
+    (@inner $($t:tt)*) => {
+        $($t)*
+    }
 }
 
 // Reexports