bugfix: wr: the raw_ahead field is used by wrpc-sw

the field is used in wrpc-sw, so move it out of "#if 0". Bug introduced by e441b48b, 134 commits ago. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

bugfix: wr: the raw_ahead field is used by wrpc-sw
the field is used in wrpc-sw, so move it out of "#if 0". Bug introduced by e441b48b, 134 commits ago. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
3e2ad33b · Alessandro Rubini · fd2b09a0 · 3e2ad33b · 3e2ad33b
Commit 3e2ad33b authored Mar 08, 2013 by Alessandro Rubini
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

wrpc-socket.c arch-wrpc/wrpc-socket.c +1 -1

ieee1588_types.h include/ppsi/ieee1588_types.h +2 -2

No files found.
--- a/arch-wrpc/wrpc-socket.c
+++ b/arch-wrpc/wrpc-socket.c
@@ -54,9 +54,9 @@ static int wrpc_net_recv(struct pp_instance *ppi, void *pkt, int len,
 		t->correct = wr_ts.correct;
 #if 0 /* I disabled the fields, for space: they were only used here */
 		t->raw_nsec = wr_ts.raw_nsec;
-		t->raw_ahead = wr_ts.raw_ahead;
 		t->raw_phase = wr_ts.raw_phase;
 #endif
+		t->raw_ahead = wr_ts.raw_ahead;
 	}
 	return got;
 }

--- a/include/ppsi/ieee1588_types.h
+++ b/include/ppsi/ieee1588_types.h
@@ -66,14 +66,14 @@ typedef struct TimeInternal {
 	int 		correct;	/* 0 or 1 */
 #if 0
 	/*
-	 * The following three fields may be used for diagnostics, but
+	 * The following two fields may be used for diagnostics, but
 	 * they cost space. So remove them but keep the code around just
 	 * in case it is useful again (they are only set, never read)
 	 */
 	int32_t raw_phase;
 	int32_t raw_nsec;
-	int32_t raw_ahead;
 #endif
+	int32_t raw_ahead;	/* raw_ahead is used during calibration */
 	/* White Rabbit extension end */
 } TimeInternal;