NaxdyOrg/embassy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge #1412

Browse source 
1412: stm32/uart: abort on error r=Dirbaio a=xoviat

This PR aborts the DMA transfer in the event of a UART error. Otherwise, the transfer will never complete, and an error will not be returned.

Co-authored-by: xoviat <xoviat@users.noreply.github.com>
This commit is contained in:
bors[bot] 2023-04-30 14:58:36 +00:00 committed by GitHub
commit 41fe718ea8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
embassy-stm32/src/usart/mod.rs
View file

@ -497,28 +497,24 @@ impl<'d, T: BasicInstance, RxDma> UartRx<'d, T, RxDma> {
unreachable!(); unreachable!();
} }
if !enable_idle_line_detection { if enable_idle_line_detection {
transfer.await; // clear idle flag
let sr = sr(r).read();
// This read also clears the error and idle interrupt flags on v1.
rdr(r).read_volatile();
clear_interrupt_flags(r, sr);
return Ok(ReadCompletionEvent::DmaCompleted); // enable idle interrupt
r.cr1().modify(|w| {
w.set_idleie(true);
});
} }
// clear idle flag
let sr = sr(r).read();
// This read also clears the error and idle interrupt flags on v1.
rdr(r).read_volatile();
clear_interrupt_flags(r, sr);
// enable idle interrupt
r.cr1().modify(|w| {
w.set_idleie(true);
});
} }
compiler_fence(Ordering::SeqCst); compiler_fence(Ordering::SeqCst);
// future which completes when idle line is detected // future which completes when idle line or error is detected
let idle = poll_fn(move |cx| { let abort = poll_fn(move |cx| {
let s = T::state(); let s = T::state();
s.rx_waker.register(cx.waker()); s.rx_waker.register(cx.waker());
@ -554,7 +550,7 @@ impl<'d, T: BasicInstance, RxDma> UartRx<'d, T, RxDma> {
} }
} }
if sr.idle() { if enable_idle_line_detection && sr.idle() {
// Idle line detected // Idle line detected
return Poll::Ready(Ok(())); return Poll::Ready(Ok(()));
} }
@ -565,7 +561,7 @@ impl<'d, T: BasicInstance, RxDma> UartRx<'d, T, RxDma> {
// wait for the first of DMA request or idle line detected to completes // wait for the first of DMA request or idle line detected to completes
// select consumes its arguments // select consumes its arguments
// when transfer is dropped, it will stop the DMA request // when transfer is dropped, it will stop the DMA request
let r = match select(transfer, idle).await { let r = match select(transfer, abort).await {
// DMA transfer completed first // DMA transfer completed first
Either::Left(((), _)) => Ok(ReadCompletionEvent::DmaCompleted), Either::Left(((), _)) => Ok(ReadCompletionEvent::DmaCompleted),