wrtd:rt:out: fix gcc warning and errors

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:out: fix gcc warning and errors
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
ce594d3b · Federico Vaga · e6026e35 · ce594d3b
Commit ce594d3b authored Mar 14, 2016 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 21 deletions

wrtd-rt-fd.c rt/fd/wrtd-rt-fd.c +3 -21

No files found.
--- a/rt/fd/wrtd-rt-fd.c
+++ b/rt/fd/wrtd-rt-fd.c
@@ -55,7 +55,7 @@ int wr_time_ready()
 	return 1;
 }

-int wr_enable_lock(int enable)
+void wr_enable_lock(int enable)
 {
 	if(enable)
 		dp_writel(FD_TCR_WR_ENABLE, FD_REG_TCR);
@@ -111,8 +111,6 @@ static struct wrtd_out_channel wrtd_out_channels[FD_NUM_CHANNELS]; /**< Output
 								      array */
 static struct wrtd_out wrtd_out_device;

-static inline int wr_is_timing_ok(void);
-
 /**
 * Writes to FD output registers for output (out)
 */
@@ -281,17 +279,6 @@ static struct pulse_queue_entry* pulse_queue_front(struct lrt_pulse_queue *p)
 }


-/**
- * Returns the newest entry in the pulse queue (or NULL if empty).
- */
-static struct pulse_queue_entry* pulse_queue_back(struct lrt_pulse_queue *p)
-{
-    if (!p->count)
-	   return NULL;
-    return &p->data[p->head];
-}
-
-
 /**
 * Releases the oldest entry from the pulse queue.
 */
@@ -758,7 +745,7 @@ static int wrtd_out_hash_table_insert(struct wrnc_proto_header *hin, void *pin,
 		return -1;
 	}
 	if (!(triggers[tidx].flags & ENTRY_FLAG_VALID))
-		return; /* nothing to do is a valid trigger */
+		return 0; /* nothing to do is a valid trigger */

 	hidx = wrtd_out_hash_table_free(&triggers[tidx].id);
 	if  (hidx < 0)
@@ -792,7 +779,7 @@ static int wrtd_out_hash_table_remove(struct wrnc_proto_header *hin, void *pin,
 	}

 	if (triggers[tidx].flags & ENTRY_FLAG_VALID)
-		return; /* nothing to do is a valid trigger */
+		return 0; /* nothing to do is a valid trigger */

 	hidx = wrtd_out_hash_table_find(&triggers[tidx].id);
 	if (hidx < 0)
@@ -815,7 +802,6 @@ static int wrtd_out_trigger_index(struct wrnc_proto_header *hin, void *pin,
 	struct wrtd_trig_id *id = pin;
 	uint32_t *index = pout;
 	int hidx;
-	int ret;

 	/* Verify that the size is correct */
 	if (hin->len * 4 != sizeof(struct wrtd_trig_id)) {
@@ -958,11 +944,7 @@ void init(void)
 {
 	int i, j;

-	pp_printf("Running %s from commit 0x%x.\n", __FILE__, version);
-	rx_ebone = 0;
-	rx_loopback = 0;
 	promiscuous_mode = 0;
-	memset(&last_received, 0, sizeof(struct wrtd_trigger_entry));
 	tlist_count = 0;
 	wr_state = WR_LINK_OFFLINE;
 	wr_enable_lock(0);