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

This commit is contained in:
Dario Nieuwenhuis
2022-02-05 03:03:32 +01:00
parent f8507b5e78
commit fbaa7e59d5
4 changed files with 68 additions and 31 deletions

View File

@ -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::*;

View File

@ -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::*;

View File

@ -1,7 +1,7 @@
#[cfg(bdma)]
mod bdma;
pub(crate) mod bdma;
#[cfg(dma)]
mod dma;
pub(crate) mod dma;
#[cfg(dmamux)]
mod dmamux;