nordic-dev.net/embassy
2
0
Fork 0
mirror of https://github.com/embassy-rs/embassy.git synced 2024-11-25 16:23:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

stm32/dma: fix h7 impls

Browse Source
This commit is contained in:
Dario Nieuwenhuis 2021-07-15 06:31:54 +02:00 committed by Bob McWhirter
parent 2ee20f5dcb
commit 63a0e188ea
3 changed files with 65 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
embassy-stm32/src/dma/bdma.rs
View File

@ -138,7 +138,6 @@ unsafe fn on_irq() {
}
}
/// safety: must be called only once
pub(crate) unsafe fn init() {
pac::interrupts! {
@ -212,6 +211,9 @@ pac::bdma_channels! {
};
}
// HACK: on stm32h7 "DMA" interrupts are for DMA, not BDMA, so this
// would cause duplicate interrupt definitions. Do it manually insted
#[cfg(not(rcc_h7))]
pac::interrupts! {
(DMA, $irq:ident) => {
#[crate::interrupt]
@ -220,3 +222,41 @@ pac::interrupts! {
}
};
}
#[cfg(rcc_h7)]
mod _if_h7 {
use super::*;
#[crate::interrupt]
unsafe fn BDMA_CHANNEL0() {
on_irq()
}
#[crate::interrupt]
unsafe fn BDMA_CHANNEL1() {
on_irq()
}
#[crate::interrupt]
unsafe fn BDMA_CHANNEL2() {
on_irq()
}
#[crate::interrupt]
unsafe fn BDMA_CHANNEL3() {
on_irq()
}
#[crate::interrupt]
unsafe fn BDMA_CHANNEL4() {
on_irq()
}
#[crate::interrupt]
unsafe fn BDMA_CHANNEL5() {
on_irq()
}
#[crate::interrupt]
unsafe fn BDMA_CHANNEL6() {
on_irq()
}
#[crate::interrupt]
unsafe fn BDMA_CHANNEL7() {
on_irq()
}
}

37
embassy-stm32/src/dma/dmamux.rs
View File

@ -31,28 +31,33 @@ macro_rules! dma_num {
(DMA2) => {
1
};
(BDMA) => {
0
};
}
macro_rules! dmamux_peri {
(DMA1) => {
crate::pac::DMAMUX1
};
(DMA2) => {
crate::pac::DMAMUX1
};
(BDMA) => {
crate::pac::DMAMUX1
};
}
#[cfg(not(rcc_h7))]
pac::bdma_channels! {
($channel_peri:ident, $dma_peri:ident, $channel_num:expr) => {
impl MuxChannel for peripherals::$channel_peri {
const DMAMUX_CH_NUM: u8 = (dma_num!($dma_peri) * 8) + $channel_num;
const DMAMUX_REGS: pac::dmamux::Dmamux = dmamux_peri!($dma_peri);
const DMAMUX_REGS: pac::dmamux::Dmamux = pac::DMAMUX1;
}
};
}
#[cfg(rcc_h7)]
pac::dma_channels! {
($channel_peri:ident, $dma_peri:ident, $channel_num:expr) => {
impl MuxChannel for peripherals::$channel_peri {
const DMAMUX_CH_NUM: u8 = (dma_num!($dma_peri) * 8) + $channel_num;
const DMAMUX_REGS: pac::dmamux::Dmamux = pac::DMAMUX1;
}
};
}
#[cfg(rcc_h7)]
pac::bdma_channels! {
($channel_peri:ident, $dma_peri:ident, $channel_num:expr) => {
impl MuxChannel for peripherals::$channel_peri {
const DMAMUX_CH_NUM: u8 = $channel_num;
const DMAMUX_REGS: pac::dmamux::Dmamux = pac::DMAMUX2;
}
};
}

9
examples/stm32h7/src/bin/usart.rs
View File

@ -1,4 +1,3 @@
#![no_std]
#![no_main]
#![feature(trait_alias)]
@ -13,12 +12,12 @@ use cortex_m::prelude::_embedded_hal_blocking_serial_Write;
use embassy::executor::Executor;
use embassy::time::Clock;
use embassy::util::Forever;
use embassy_stm32::dma::NoDma;
use embassy_stm32::usart::{Config, Uart};
use embassy_stm32::dma_traits::NoDma;
use example_common::*;
use stm32h7xx_hal as hal;
use hal::prelude::*;
use stm32h7xx_hal as hal;
use cortex_m_rt::entry;
use stm32h7::stm32h743 as pac;
@ -60,8 +59,7 @@ fn main() -> ! {
let rcc = pp.RCC.constrain();
rcc
.sys_ck(96.mhz())
rcc.sys_ck(96.mhz())
.pclk1(48.mhz())
.pclk2(48.mhz())
.pclk3(48.mhz())
@ -89,7 +87,6 @@ fn main() -> ! {
w
});
unsafe { embassy::time::set_clock(&ZeroClock) };
let executor = EXECUTOR.put(Executor::new());