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

stm32: fix buffered uart flush

Browse source 
usart_v4 uses internal FIFO and therefore actually all bytes are not yet sent out although state.tx_buf.is_empty()
This commit is contained in:
Andres Vahter 2024-01-08 17:33:11 +02:00 committed by Dario Nieuwenhuis
parent a2eb46e9e4
commit ec47e931ac
1 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
embassy-stm32/src/usart/buffered.rs
View file

@ -1,5 +1,6 @@
use core::future::poll_fn; use core::future::poll_fn;
use core::slice; use core::slice;
use core::sync::atomic::{AtomicBool, Ordering};
use core::task::Poll; use core::task::Poll;
use embassy_hal_internal::atomic_ring_buffer::RingBuffer; use embassy_hal_internal::atomic_ring_buffer::RingBuffer;
@ -61,6 +62,18 @@ impl<T: BasicInstance> interrupt::typelevel::Handler<T::Interrupt> for Interrupt
state.rx_waker.wake(); state.rx_waker.wake();
} }
// With `usart_v4` hardware FIFO is enabled, making `state.tx_buf`
// insufficient to determine if all bytes are sent out.
// Transmission complete (TC) interrupt here indicates that all bytes are pushed out from the FIFO.
#[cfg(usart_v4)]
if sr_val.tc() {
r.cr1().modify(|w| {
w.set_tcie(false);
});
state.tx_done.store(true, Ordering::Release);
state.rx_waker.wake();
}
// TX // TX
if sr(r).read().txe() { if sr(r).read().txe() {
let mut tx_reader = state.tx_buf.reader(); let mut tx_reader = state.tx_buf.reader();
@ -69,6 +82,12 @@ impl<T: BasicInstance> interrupt::typelevel::Handler<T::Interrupt> for Interrupt
r.cr1().modify(|w| { r.cr1().modify(|w| {
w.set_txeie(true); w.set_txeie(true);
}); });
#[cfg(usart_v4)]
r.cr1().modify(|w| {
w.set_tcie(true);
});
tdr(r).write_volatile(buf[0].into()); tdr(r).write_volatile(buf[0].into());
tx_reader.pop_done(1); tx_reader.pop_done(1);
state.tx_waker.wake(); state.tx_waker.wake();
@ -90,6 +109,7 @@ pub(crate) mod sealed {
pub(crate) rx_buf: RingBuffer, pub(crate) rx_buf: RingBuffer,
pub(crate) tx_waker: AtomicWaker, pub(crate) tx_waker: AtomicWaker,
pub(crate) tx_buf: RingBuffer, pub(crate) tx_buf: RingBuffer,
pub(crate) tx_done: AtomicBool,
} }
impl State { impl State {
@ -100,6 +120,7 @@ pub(crate) mod sealed {
tx_buf: RingBuffer::new(), tx_buf: RingBuffer::new(),
rx_waker: AtomicWaker::new(), rx_waker: AtomicWaker::new(),
tx_waker: AtomicWaker::new(), tx_waker: AtomicWaker::new(),
tx_done: AtomicBool::new(true),
} }
} }
} }
@ -366,6 +387,8 @@ impl<'d, T: BasicInstance> BufferedUartTx<'d, T> {
async fn write(&self, buf: &[u8]) -> Result<usize, Error> { async fn write(&self, buf: &[u8]) -> Result<usize, Error> {
poll_fn(move |cx| { poll_fn(move |cx| {
let state = T::buffered_state(); let state = T::buffered_state();
state.tx_done.store(false, Ordering::Release);
let empty = state.tx_buf.is_empty(); let empty = state.tx_buf.is_empty();
let mut tx_writer = unsafe { state.tx_buf.writer() }; let mut tx_writer = unsafe { state.tx_buf.writer() };
@ -391,6 +414,13 @@ impl<'d, T: BasicInstance> BufferedUartTx<'d, T> {
async fn flush(&self) -> Result<(), Error> { async fn flush(&self) -> Result<(), Error> {
poll_fn(move |cx| { poll_fn(move |cx| {
let state = T::buffered_state(); let state = T::buffered_state();
#[cfg(usart_v4)]
if !state.tx_done.load(Ordering::Acquire) {
state.tx_waker.register(cx.waker());
return Poll::Pending;
}
#[cfg(not(usart_v4))]
if !state.tx_buf.is_empty() { if !state.tx_buf.is_empty() {
state.tx_waker.register(cx.waker()); state.tx_waker.register(cx.waker());
return Poll::Pending; return Poll::Pending;