max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Abort DMA operation when dropping a Transfer, and panic on DMA errors

Browse Source
This commit is contained in:
Mathias 2022-08-23 13:20:36 +02:00
parent f6c2e26372
commit 7e3ce2c90b
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
embassy-rp/src/dma.rs
View File

@ -14,8 +14,18 @@ use crate::{interrupt, pac, peripherals};
#[interrupt] #[interrupt]
unsafe fn DMA_IRQ_0() { unsafe fn DMA_IRQ_0() {
let ints0 = pac::DMA.ints0().read().ints0(); let ints0 = pac::DMA.ints0().read().ints0();
for channel in 0..CHANNEL_COUNT { for channel in 0..CHANNEL_COUNT {
let ctrl_trig = pac::DMA.ch(channel).ctrl_trig().read();
if ctrl_trig.ahb_error() {
panic!("DMA: ahb error on DMA_0 channel {}", channel);
}
if ctrl_trig.read_error() {
panic!("DMA: read error on DMA_0 channel {}", channel);
}
if ctrl_trig.write_error() {
panic!("DMA: write error on DMA_0 channel {}", channel);
}
if ints0 & (1 << channel) == (1 << channel) { if ints0 & (1 << channel) == (1 << channel) {
CHANNEL_WAKERS[channel].wake(); CHANNEL_WAKERS[channel].wake();
} }
@ -119,7 +129,9 @@ impl<'a, C: Channel> Drop for Transfer<'a, C> {
fn drop(&mut self) { fn drop(&mut self) {
let p = self.channel.regs(); let p = self.channel.regs();
unsafe { unsafe {
p.ctrl_trig().write(|w| w.set_en(false)); pac::DMA
.chan_abort()
.modify(|m| m.set_chan_abort(1 << self.channel.number()));
while p.ctrl_trig().read().busy() {} while p.ctrl_trig().read().busy() {}
} }
} }