stm32/dma: fix interrupt codegen for new stm32-data

3 files changed, 4 insertions, 23 deletions

diff --git a/embassy-stm32/src/dma/bdma.rs b/embassy-stm32/src/dma/bdma.rs
index e06ce8c36..ebb0467dc 100644
--- a/embassy-stm32/src/dma/bdma.rs
+++ b/embassy-stm32/src/dma/bdma.rs
@@ -7,7 +7,6 @@ use embassy::interrupt::{Interrupt, InterruptExt};
 use embassy::waitqueue::AtomicWaker;
 
 use crate::dma::Request;
-use crate::interrupt;
 use crate::pac;
 use crate::pac::bdma::vals;
 use crate::rcc::sealed::RccPeripheral;
@@ -53,7 +52,7 @@ macro_rules! dma_num {
     };
 }
 
-unsafe fn on_irq() {
+pub(crate) unsafe fn on_irq() {
     pac::peripherals! {
         (bdma, $dma:ident) => {
                 let isr = pac::$dma.isr().read();
@@ -170,15 +169,6 @@ pac::dma_channels! {
     };
 }
 
-pac::interrupts! {
-    ($peri:ident, bdma, $block:ident, $signal_name:ident, $irq:ident) => {
-        #[crate::interrupt]
-        unsafe fn $irq () {
-            on_irq()
-        }
-    };
-}
-
 mod low_level_api {
     use super::*;
 
diff --git a/embassy-stm32/src/dma/dma.rs b/embassy-stm32/src/dma/dma.rs
index 8e48bb26f..21623b90c 100644
--- a/embassy-stm32/src/dma/dma.rs
+++ b/embassy-stm32/src/dma/dma.rs
@@ -47,7 +47,7 @@ macro_rules! dma_num {
     };
 }
 
-unsafe fn on_irq() {
+pub(crate) unsafe fn on_irq() {
     pac::peripherals! {
         (dma, $dma:ident) => {
             for isrn in 0..2 {
@@ -162,15 +162,6 @@ pac::dma_channels! {
     };
 }
 
-pac::interrupts! {
-    ($peri:ident, dma, $block:ident, $signal_name:ident, $irq:ident) => {
-        #[crate::interrupt]
-        unsafe fn $irq () {
-            on_irq()
-        }
-    };
-}
-
 mod low_level_api {
     use super::*;
 
diff --git a/embassy-stm32/src/dma/mod.rs b/embassy-stm32/src/dma/mod.rs
index 3b22faca7..1c9661561 100644
--- a/embassy-stm32/src/dma/mod.rs
+++ b/embassy-stm32/src/dma/mod.rs
@@ -1,7 +1,7 @@
 #[cfg(bdma)]
-mod bdma;
+pub(crate) mod bdma;
 #[cfg(dma)]
-mod dma;
+pub(crate) mod dma;
 #[cfg(dmamux)]
 mod dmamux;