From bedab235f9028562b6677fa257cd08fbf1efecca Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Tue, 20 Oct 2015 00:27:07 +0300
Subject: [PATCH] stmhal/uart: If char is not received within timeout, return
EAGAIN error.
Instead of return 0, which means EOF. There's no good way to detect EOF on
continuously active bus like UART, and treat timeout as just temporary
unvailability of data. .read() method of UART object will return None in
this case (instead of 0, which again measn EOF). This is fully compliant
with unix port.
---
stmhal/uart.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/stmhal/uart.c b/stmhal/uart.c
index 85feb32e0..177318aec 100644
--- a/stmhal/uart.c
+++ b/stmhal/uart.c
@@ -772,9 +772,9 @@ STATIC mp_uint_t pyb_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, i
// wait for first char to become available
if (!uart_rx_wait(self, self->timeout)) {
- // we can either return 0 to indicate EOF (then read() method returns b'')
- // or return EAGAIN error to indicate non-blocking (then read() method returns None)
- return 0;
+ // return EAGAIN error to indicate non-blocking (then read() method returns None)
+ *errcode = EAGAIN;
+ return MP_STREAM_ERROR;
}
// read the data
--
GitLab