wrtd:rt: fix loop data type

Signed-off-by: Federico Vaga <federico.vaga@cern.ch> NOTE This commit has been created by `git subtree` on the Mock Turtle repository on tag mock-turtle-2.0 This commit will not compile

wrtd:rt: fix loop data type
Signed-off-by: Federico Vaga <federico.vaga@cern.ch> NOTE This commit has been created by `git subtree` on the Mock Turtle repository on tag mock-turtle-2.0 This commit will not compile
092aa589 · Federico Vaga · 207f6f59 · 092aa589 · 092aa589 · 092aa589
Commit 092aa589 authored May 31, 2016 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 7 deletions

loop-queue.c rt/common/loop-queue.c +3 -3

loop-queue.h rt/common/loop-queue.h +3 -2

wrtd-rt-fd.c rt/fd/wrtd-rt-fd.c +4 -2

No files found.
--- a/rt/common/loop-queue.c
+++ b/rt/common/loop-queue.c
@@ -19,7 +19,7 @@

 #define LOOP_QUEUE_SIZE 16

-static SMEM unsigned int head, tail, count;
+static SMEM int head, tail, count;
 static SMEM struct wrtd_trigger_entry buf[16];

 void loop_queue_init()
@@ -45,9 +45,9 @@ void loop_queue_push(struct wrtd_trig_id *id, uint32_t seq,
 	smem_atomic_add(&count, 1);
 }

-struct wrtd_trigger_entry *loop_queue_pop(void)
+volatile struct wrtd_trigger_entry *loop_queue_pop(void)
 {
-	struct wrtd_trigger_entry *rv;
+	volatile struct wrtd_trigger_entry *rv;

 	if (count == 0)
 		return NULL;  /* No entry */

--- a/rt/common/loop-queue.h
+++ b/rt/common/loop-queue.h
@@ -23,8 +23,9 @@
 #define LOOP_QUEUE_SIZE 16

 void loop_queue_init();
-void loop_queue_push(struct wrtd_trig_id *id, uint32_t seq, struct wr_timestamp *ts);
-struct wrtd_trigger_entry *loop_queue_pop();
+void loop_queue_push(struct wrtd_trig_id *id, uint32_t seq,
+		     struct wr_timestamp *ts);
+volatile struct wrtd_trigger_entry *loop_queue_pop(void);

 #endif


--- a/rt/fd/wrtd-rt-fd.c
+++ b/rt/fd/wrtd-rt-fd.c
@@ -627,7 +627,8 @@ static void filter_trigger(struct wrtd_trigger_entry *trig)

 void do_rx(void)
 {
-	struct wrtd_trigger_entry *ent;
+        volatile struct wrtd_trigger_entry *ent;
+	struct wrtd_trigger_entry trig;
 	struct wrtd_trigger_message *msg;
 	int i;

@@ -646,7 +647,8 @@ void do_rx(void)
 	/* Check from the loopback */
 	ent = loop_queue_pop();
 	if (ent) {
-		filter_trigger (ent);
+		trig = *ent;
+		filter_trigger (&trig);
 		wrtd_out_device.counter_loopback++;
 	}
 }