fixup! ethos: move bulk of state machine out of ISR context

miri64 · miri64 · commit febe55984c80 · 2021-11-25T14:24:24.000+01:00
diff --git a/drivers/ethos/ethos.c b/drivers/ethos/ethos.c
@@ -83,23 +83,52 @@ static void _reset_state(ethos_t *dev)
     dev->frametype = 0;
 }
 
+static void _reset_tsrb(tsrb_t *tsrb)
+{
+    tsrb->reads = 0;
+    tsrb->writes = 0;
+}
+
+static void _fail_frame(ethos_t *dev)
+{
+    switch (dev->frametype) {
+        case ETHOS_FRAME_TYPE_DATA:
+            _reset_tsrb(&dev->inbuf);
+            /* signal to handler thread that frame is at an end (makes handler thread to
+             * truncate frame) */
+            tsrb_add_one(&dev->inbuf, ETHOS_FRAME_DELIMITER);
+            break;
+        case ETHOS_FRAME_TYPE_TEXT:
+            mutex_lock(&ethos_stdio_isrpipe.mutex);
+            _reset_tsrb(&ethos_stdio_isrpipe.tsrb);
+            mutex_unlock(&ethos_stdio_isrpipe.mutex);
+            /* signal to handler thread that frame is at an end (makes handler thread to
+             * truncate frame) */
+            isrpipe_write_one(&ethos_stdio_isrpipe, ETHOS_FRAME_DELIMITER);
+            break;
+        case ETHOS_FRAME_TYPE_ERRORED:
+            return;
+        default:
+            assert(0);
+            break;
+    }
+    dev->frametype = ETHOS_FRAME_TYPE_ERRORED;
+}
+
 static void _handle_char(ethos_t *dev, char c)
 {
     switch (dev->frametype) {
         case ETHOS_FRAME_TYPE_DATA:
             if (tsrb_add_one(&dev->inbuf, c) < 0) {
                 //puts("lost frame");
-                dev->inbuf.reads = 0;
-                dev->inbuf.writes = 0;
-                dev->frametype = 0;
+                _fail_frame(dev);
             }
             break;
         case ETHOS_FRAME_TYPE_TEXT:
 #ifdef MODULE_STDIO_ETHOS
             if (isrpipe_write_one(&ethos_stdio_isrpipe, c) < 0) {
                 //puts("lost frame");
-                dev->inbuf.reads = 0;
-                dev->inbuf.writes = 0;
+                _fail_frame(dev);
             }
             break;
 #endif
@@ -175,9 +204,7 @@ static void ethos_isr(void *arg, uint8_t c)
                     return;
                 default:
                     /* unknown escaped character or raw delimiter */
-                    dev->frametype = ETHOS_FRAME_TYPE_ERRORED;
-                    dev->inbuf.reads = 0;
-                    dev->inbuf.writes = 0;
+                    _fail_frame(dev);
                     return;
             }
             dev->state = IN_FRAME;
