ports/esp8266: Added implementation for ioctl.

dmascord · MrJake222 · commit 98eb666d3526 · 2021-09-13T16:19:59.000+02:00
select.select now works.
diff --git a/ports/esp8266/machine_softuart.c b/ports/esp8266/machine_softuart.c
@@ -223,8 +223,21 @@ STATIC mp_uint_t pyb_softuart_write(mp_obj_t self_in, const void *buf_in, mp_uin
 }
 
 STATIC mp_uint_t pyb_softuart_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) {
-    *errcode = MP_EINVAL;
-    return MP_STREAM_ERROR;
+    mp_uint_t ret;
+    if (request == MP_STREAM_POLL) {
+        mp_uint_t flags = arg;
+        ret = 0;
+        if ((flags & MP_STREAM_POLL_RD) && Softuart_rx_any(&softuartDevice)) {
+            ret |= MP_STREAM_POLL_RD;
+        }
+        if ((flags & MP_STREAM_POLL_WR) && Softuart_tx_any_room(&softuartDevice)) {
+            ret |= MP_STREAM_POLL_WR;
+        }
+    } else {
+        *errcode = MP_EINVAL;
+        ret = MP_STREAM_ERROR;
+    }
+    return ret;
 }
 
 STATIC const mp_stream_p_t softuart_stream_p = {
diff --git a/ports/esp8266/softuart.c b/ports/esp8266/softuart.c
@@ -334,9 +334,19 @@ uint32_t Softuart_Flush(Softuart *s)
 // Is data in buffer available?
 BOOL Softuart_Available(Softuart *s)
 {
-	return (s->buffer.receive_buffer_tail + SOFTUART_MAX_RX_BUFF - s->buffer.receive_buffer_head) % SOFTUART_MAX_RX_BUFF;
+    return (s->buffer.receive_buffer_tail + SOFTUART_MAX_RX_BUFF - s->buffer.receive_buffer_head) % SOFTUART_MAX_RX_BUFF;
 }
 
+int Softuart_rx_any(Softuart *s) {
+    return (Softuart_Available(s));
+}
+
+int Softuart_tx_any_room(Softuart *s) {
+    // TODO always assume we have room... there is no send buffer
+    return true;
+}
+
+
 // cversek:
 // based on micropython/esp8266/uart.c bool uart_rx_wait(uint32_t timeout_us)
 // Waits at most timeout microseconds for at least 1 char to become ready for reading.
diff --git a/ports/esp8266/softuart.h b/ports/esp8266/softuart.h
@@ -45,6 +45,9 @@ void Softuart_Putchar(Softuart *s, char data);
 void Softuart_Puts(Softuart *s, const char *c );
 uint8_t Softuart_Read(Softuart *s);
 uint8_t Softuart_Readline(Softuart *s, char* Buffer, uint8_t MaxLen );
+// check status of rx/tx
+int Softuart_rx_any(Softuart *s);
+int Softuart_tx_any_room(Softuart *s);
 
 //define mapping from pin to functio mode
 typedef struct {
