*:rt: fix gcc warnings on all applications

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

*:rt: fix gcc warnings on all applications
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
2120f191 · Federico Vaga · 3dfdcadb · 2120f191 · 2120f191 · 2120f191
Commit 2120f191 authored Feb 05, 2016 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 95 additions and 90 deletions

wrtd-serializers.h include/wrtd-serializers.h +1 -1

wrtd-rt-fd.c rt/fd/wrtd-rt-fd.c +91 -84

wrtd-rt-tdc.c rt/tdc/wrtd-rt-tdc.c +3 -5

No files found.
--- a/include/wrtd-serializers.h
+++ b/include/wrtd-serializers.h
@@ -144,7 +144,7 @@ static inline int wrtd_msg_timestamp ( struct wrnc_msg *buf, struct wr_timestamp
        buf->data[buf->datalen + 3] = 	ts->frac;
 	buf->datalen += 4;
    } else {
-       ts->seconds = 	buf->data[buf->offset + 0] << 32;
+	ts->seconds = 	((uint64_t)buf->data[buf->offset + 0]) << 32;
       ts->seconds |=	buf->data[buf->offset + 1];
 	ts->ticks = 	buf->data[buf->offset + 2];
        ts->frac = 	buf->data[buf->offset + 3];

--- a/rt/fd/wrtd-rt-fd.c
+++ b/rt/fd/wrtd-rt-fd.c
@@ -33,6 +33,85 @@
 static const uint32_t version = GIT_VERSION;
 static uint32_t promiscuous_mode = 0;
+#define WR_LINK_OFFLINE		1
+#define WR_LINK_ONLINE		2
+#define WR_LINK_SYNCING		3
+#define WR_LINK_SYNCED		4
+static int wr_state;
+int wr_link_up()
+{
+	return dp_readl ( FD_REG_TCR ) & FD_TCR_WR_LINK;
+}
+int wr_time_locked()
+{
+	return dp_readl ( FD_REG_TCR ) & FD_TCR_WR_LOCKED;
+}
+int wr_time_ready()
+{
+	return 1;
+}
+int wr_enable_lock( int enable )
+{
+	if(enable)
+		dp_writel ( FD_TCR_WR_ENABLE, FD_REG_TCR );
+	else
+		dp_writel ( 0, FD_REG_TCR);
+	return 0;
+}
+void wr_update_link()
+{
+	switch(wr_state)
+	{
+		case WR_LINK_OFFLINE:
+			if ( wr_link_up() )
+			{
+				wr_state = WR_LINK_ONLINE;
+			}
+			break;
+		case WR_LINK_ONLINE:
+			if (wr_time_ready())
+			{
+				wr_state = WR_LINK_SYNCING;
+				wr_enable_lock(1);
+			}
+			break;
+		case WR_LINK_SYNCING:
+			if (wr_time_locked())
+			{
+				pp_printf("WR link up!\n");
+				wr_state = WR_LINK_SYNCED;
+			}
+			break;
+		case WR_LINK_SYNCED:
+			break;
+	}
+	if( wr_state != WR_LINK_OFFLINE && !wr_link_up() )
+	{
+		wr_state = WR_LINK_OFFLINE;
+		wr_enable_lock(0);
+	}
+}
+int wr_is_timing_ok()
+{
+	return (wr_state == WR_LINK_SYNCED);
+}
 /**
 * Rule defining the behaviour of a trigger output upon reception of a
 * trigger message with matching ID
@@ -129,7 +208,8 @@ int trigger_search(struct lrt_hash_entry **tlist,
 struct lrt_hash_entry *rtfd_trigger_entry_find(struct wrtd_trig_id *id)
 {
-	int index, ret;
+	unsigned int index;
+	int ret;
 	ret = trigger_search(ord_tlist, id, 0, tlist_count, &index);
@@ -146,7 +226,8 @@ struct lrt_hash_entry * rtfd_trigger_entry_update(struct wrtd_trig_id *id,
 						  int output,
 						  struct lrt_output_rule *rule)
 {
-	int i = -1, k, cmp, index = 0, ret = 0;
+	unsigned int index = 0;
+	int i = -1, k, ret = 0;
 	ret = trigger_search(ord_tlist, id, 0, tlist_count, &index);
@@ -189,8 +270,8 @@ struct lrt_hash_entry * rtfd_trigger_entry_update(struct wrtd_trig_id *id,
 */
 void rtfd_trigger_entry_remove(struct lrt_hash_entry *ent, unsigned int output)
 {
-	int i, index = 0, ret;
+	unsigned int index = 0;
-	struct lrt_hash_entry *tmp, *new;
+	int i, ret;
 	ret = trigger_search(ord_tlist, &ent->id, 0, tlist_count, &index);
 	if (!ret) {
@@ -471,8 +552,9 @@ static int check_output_timeout (struct lrt_output *out)
 void update_latency_stats (struct pulse_queue_entry *pq_ent)
 {
 /* Read the time and calculate the latency */
-	volatile uint32_t dummy = lr_readl (WRN_CPU_LR_REG_TAI_SEC);
+	__attribute__((unused))
-	int latency = lr_readl (WRN_CPU_LR_REG_TAI_CYCLES) - pq_ent->origin_cycles;
+		volatile uint32_t dummy = lr_readl(WRN_CPU_LR_REG_TAI_SEC);
+	int latency = lr_readl(WRN_CPU_LR_REG_TAI_CYCLES) - pq_ent->origin_cycles;
 	if (latency < 0)
 		latency += 125 * 1000 * 1000;
@@ -529,9 +611,6 @@ void do_output (struct lrt_output *out)
 {
 	struct lrt_pulse_queue *q = &out->queue;
 	struct pulse_queue_entry *pq_ent = pulse_queue_front(q);
-	struct lrt_output_rule dummy_rule;
-	struct lrt_output_rule *rule = (pq_ent->rule ? pq_ent->rule : &dummy_rule);
 	uint32_t dcr = fd_ch_readl(out, FD_REG_DCR);
 	/* Check if the output has triggered */
@@ -1080,7 +1159,7 @@ static inline void ctl_ping (uint32_t seq, struct wrnc_msg *ibuf)
 static inline void ctl_base_time (uint32_t seq, struct wrnc_msg *ibuf)
 {
 	struct wrnc_msg buf = ctl_claim_out_buf();
-	uint32_t id_ack = WRTD_REP_BASE_TIME_ID, seconds, ticks;
+	uint32_t id_ack = WRTD_REP_BASE_TIME_ID;
 	struct wr_timestamp ts;
 	ts.seconds = lr_readl(WRN_CPU_LR_REG_TAI_SEC);
@@ -1182,7 +1261,7 @@ static inline void ctl_software_trigger (uint32_t seq, struct wrnc_msg *ibuf)
 		tc.frac = 0;
 		tc.ticks += 10000;
 	} else {
-		wrnc_msg_timestamp(ibuf, &tc);
+		wrtd_msg_timestamp(ibuf, &tc);
 	}
 	struct wrnc_msg obuf = ctl_claim_out_buf();
@@ -1198,7 +1277,7 @@ static inline void ctl_software_trigger (uint32_t seq, struct wrnc_msg *ibuf)
 		tc.seconds++;
 	}
-	wrnc_msg_timestamp(&obuf, &tc);
+	wrtd_msg_timestamp(&obuf, &tc);
 	hmq_msg_send (&obuf);
 	struct lrt_output *out = &outputs[ch];
@@ -1359,78 +1438,6 @@ void init_outputs()
    }
 }
-#define WR_LINK_OFFLINE		1
-#define WR_LINK_ONLINE		2
-#define WR_LINK_SYNCING		3
-#define WR_LINK_SYNCED		4
-static int wr_state;
-int wr_link_up()
-{
-	return dp_readl ( FD_REG_TCR ) & FD_TCR_WR_LINK;
-}
-int wr_time_locked()
-{
-	return dp_readl ( FD_REG_TCR ) & FD_TCR_WR_LOCKED;
-}
-int wr_time_ready()
-{
-	return 1;
-}
-int wr_enable_lock( int enable )
-{
-	if(enable)
-		dp_writel ( FD_TCR_WR_ENABLE, FD_REG_TCR );
-	else
-		dp_writel ( 0, FD_REG_TCR);
-}
-void wr_update_link()
-{
-	switch(wr_state)
-	{
-		case WR_LINK_OFFLINE:
-			if ( wr_link_up() )
-			{
-				wr_state = WR_LINK_ONLINE;
-			}
-			break;
-		case WR_LINK_ONLINE:
-			if (wr_time_ready())
-			{
-				wr_state = WR_LINK_SYNCING;
-				wr_enable_lock(1);
-			}
-			break;
-		case WR_LINK_SYNCING:
-			if (wr_time_locked())
-			{
-				pp_printf("WR link up!\n");
-				wr_state = WR_LINK_SYNCED;
-			}
-			break;
-		case WR_LINK_SYNCED:
-			break;
-	}
-	if( wr_state != WR_LINK_OFFLINE && !wr_link_up() )
-	{
-		wr_state = WR_LINK_OFFLINE;
-		wr_enable_lock(0);
-	}
-}
-int wr_is_timing_ok()
-{
-	return (wr_state == WR_LINK_SYNCED);
-}
 void init()
 {

--- a/rt/tdc/wrtd-rt-tdc.c
+++ b/rt/tdc/wrtd-rt-tdc.c
@@ -91,7 +91,7 @@ static int wrtd_in_trigger_log(int type, int miss_reason,
 	};
 	if (!(st->config.log_level & type))
-		return;
+		return -1;
 	out_buf = rt_mq_claim_out(&hdr);
 	log = (struct wrtd_log_entry *)rt_proto_payload_get(out_buf.data);
@@ -286,10 +286,8 @@ static int wrtd_in_trigger_sw(struct wrnc_proto_header *hin, void *pin,
 	return 0;
 }
-int wr_enable_lock(int enable)
+void wr_enable_lock(int enable)
 {
-	int i = 0;
 	dp_writel(TDC_CTRL_DIS_ACQ, BASE_DP_TDC_REGS + TDC_REG_CTRL);
 	if (enable)
 		dp_writel(TDC_WR_CTRL_ENABLE, BASE_DP_TDC_REGS + TDC_REG_WR_CTRL);
@@ -476,7 +474,7 @@ static void init(void)
 	dp_writel(DEFAULT_DEAD_TIME, BASE_DP_TDC_DIRECT + DR_REG_DEAD_TIME);
 	/* Set up channel states to safe default values */
-	memset(&wrtd_in_channels[i], 0,
+	memset(wrtd_in_channels, 0,
 	       sizeof(struct wrtd_in_channel) * TDC_NUM_CHANNELS);
 	for(i = 0; i < TDC_NUM_CHANNELS; i++) {
 		wrtd_in_channels[i].n = i;