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

Stop active DMA transfer on drop

Browse Source
This commit is contained in:
Mathias 2022-08-18 20:30:24 +02:00
parent d35a1c9790
commit 3bbfc11f45
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,9 +30,6 @@ pub fn copy<'a, C: Channel, W: Word>(ch: impl Peripheral<P = C> + 'a, from: &[W]
w.set_en(true); w.set_en(true);
}); });
// FIXME:
while p.ctrl_trig().read().busy() {}
compiler_fence(Ordering::SeqCst); compiler_fence(Ordering::SeqCst);
} }
Transfer::new(ch) Transfer::new(ch)
@ -51,8 +48,11 @@ impl<'a, C: Channel> Transfer<'a, C> {
impl<'a, C: Channel> Drop for Transfer<'a, C> { impl<'a, C: Channel> Drop for Transfer<'a, C> {
fn drop(&mut self) { fn drop(&mut self) {
// self.channel.request_stop(); let p = self.channel.regs();
// while self.channel.is_running() {} unsafe {
p.ctrl_trig().write(|w| w.set_en(false));
while p.ctrl_trig().read().busy() {}
}
} }
} }
@ -64,7 +64,7 @@ impl<'a, C: Channel> Future for Transfer<'a, C> {
// if self.channel.is_running() { // if self.channel.is_running() {
// Poll::Pending // Poll::Pending
// } else { // } else {
Poll::Ready(()) Poll::Ready(())
// } // }
} }
} }
@ -87,9 +87,7 @@ pub trait Channel: Peripheral<P = Self> + sealed::Channel + Into<AnyChannel> + S
} }
fn degrade(self) -> AnyChannel { fn degrade(self) -> AnyChannel {
AnyChannel { AnyChannel { number: self.number() }
number: self.number(),
}
} }
} }