From 07472d05db64a0990b4d47cb001d1a40ba78414f Mon Sep 17 00:00:00 2001 From: robert-hh Date: Sun, 7 Jan 2024 17:53:53 +0100 Subject: [PATCH] rp2/machine_uart: Fix event wait in uart.flush() and uart.read(). Do not wait in the worst case up to the timeout. Fixes issue #13377. Signed-off-by: robert-hh --- ports/rp2/machine_uart.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/rp2/machine_uart.c b/ports/rp2/machine_uart.c index d751b7af07..bca07cebfc 100644 --- a/ports/rp2/machine_uart.c +++ b/ports/rp2/machine_uart.c @@ -483,7 +483,7 @@ STATIC mp_uint_t mp_machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t return i; } } - mp_event_wait_ms(timeout - elapsed); + mp_event_handle_nowait(); } *dest++ = ringbuf_get(&(self->read_buffer)); start = mp_hal_ticks_ms(); // Inter-character timeout @@ -559,7 +559,7 @@ STATIC mp_uint_t mp_machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uint if (now >= timeout) { break; } - mp_event_wait_ms((timeout - now) / 1000); + mp_event_handle_nowait(); } *errcode = MP_ETIMEDOUT; ret = MP_STREAM_ERROR;