rp2/machine_uart: Fix event wait in uart.flush() and uart.read().

robert-hh · dpgeorge · commit 068aa28fc51f · 2024-02-16T10:44:40.000+11:00
Do not wait in the worst case up to the timeout. Fixes issue #13377. Signed-off-by: robert-hh <robert@hammelrath.com>
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -483,7 +483,7 @@ STATIC mp_uint_t mp_machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t`
`483`	`483`	`return i;`
`484`	`484`	`}`
`485`	`485`	`}`
`486`		`- mp_event_wait_ms(timeout - elapsed);`
	`486`	`+ mp_event_handle_nowait();`
`487`	`487`	`}`
`488`	`488`	`*dest++ = ringbuf_get(&(self->read_buffer));`
`489`	`489`	`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`
`559`	`559`	`if (now >= timeout) {`
`560`	`560`	`break;`
`561`	`561`	`}`
`562`		`- mp_event_wait_ms((timeout - now) / 1000);`
	`562`	`+ mp_event_handle_nowait();`
`563`	`563`	`}`
`564`	`564`	`*errcode = MP_ETIMEDOUT;`
`565`	`565`	`ret = MP_STREAM_ERROR;`