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

stm32/uart: abort on error

Browse Source
This commit is contained in:
xoviat 2023-04-28 21:43:03 -05:00
parent fb27594b2e
commit b77794c9a7
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
embassy-stm32/src/usart/mod.rs
View File

@ -497,12 +497,7 @@ impl<'d, T: BasicInstance, RxDma> UartRx<'d, T, RxDma> {
unreachable!(); unreachable!();
} }
if !enable_idle_line_detection { if enable_idle_line_detection {
transfer.await;
return Ok(ReadCompletionEvent::DmaCompleted);
}
// clear idle flag // clear idle flag
let sr = sr(r).read(); let sr = sr(r).read();
// This read also clears the error and idle interrupt flags on v1. // This read also clears the error and idle interrupt flags on v1.
@ -514,11 +509,12 @@ impl<'d, T: BasicInstance, RxDma> UartRx<'d, T, RxDma> {
w.set_idleie(true); 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),