sw: Fix loopback NET_TX bug

Fix bug where an event passed to another CPU with NET_TX capability would be mis-routed.

sw: Fix loopback NET_TX bug
Fix bug where an event passed to another CPU with NET_TX capability would be mis-routed.
fed05a7e · Dimitris Lampridis · Dimitris Lampridis · e3f785e2 · fed05a7e
Commit fed05a7e authored Jun 07, 2019 by Dimitris Lampridis Committed by Dimitris Lampridis Jun 26, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 1 deletion

wrtd-rt-common.h software/firmware/common/wrtd-rt-common.h +11 -1

No files found.
--- a/software/firmware/common/wrtd-rt-common.h
+++ b/software/firmware/common/wrtd-rt-common.h
@@ -34,6 +34,11 @@ static void wrtd_local_output(struct wrtd_event *ev, unsigned ch);
 static int  wrtd_user_init(void);
 static void wrtd_io(void);

+/* Forward function declarations.  */
+#if WRTD_NET_TX > 0
+static int wrtd_send_network(struct wrtd_event *ev);
+#endif
+
 static struct wrtd_rule rules[NBR_RULES];
 static struct wrtd_alarm alarms[NBR_ALARMS];

@@ -167,7 +172,12 @@ static void wrtd_recv_loopback(void)

        e = &q->buf[q->read_idx];

-        wrtd_local_output((struct wrtd_event *)&e->ev, e->ch);
+#if WRTD_NET_TX > 0
+        if (e->ch == WRTD_DEST_CH_NET)
+                wrtd_send_network((struct wrtd_event *)&e->ev);
+        else
+#endif // WRTD_NET_TX
+                wrtd_local_output((struct wrtd_event *)&e->ev, e->ch);

        q->read_idx = (q->read_idx + 1)  & (LOOPBACK_QUEUE_SIZE - 1);
 	smem_atomic_add(&q->count, -1);