Add a rounding value for interval to picos convertion

9ef24075 · Jean-Claude BAU · 4fe4f791 · 9ef24075 · 9ef24075 · 9ef24075
Commit 9ef24075 authored May 03, 2019 by Jean-Claude BAU
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

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

pp-time.h include/ppsi/pp-time.h +1 -1

time-arith.c lib/time-arith.c +1 -1

No files found.
--- a/include/ppsi/ieee1588_types.h
+++ b/include/ppsi/ieee1588_types.h
@@ -54,7 +54,7 @@ typedef struct _UInteger64 { /*/* TODO : Should be replaced by UInteger64 */
 #define TIME_INTERVAL_FRACBITS 16
 #define TIME_INTERVAL_FRACMASK 0xFFFF
 #define TIME_INTERVAL_FRACBITS_AS_FLOAT 16.0
-#define TIME_INTERVAL_ROUNDING_VALUE (1<<(TIME_INTERVAL_FRACBITS-1))
+#define TIME_INTERVAL_ROUNDING_VALUE ((uint64_t)1<<(TIME_INTERVAL_FRACBITS-1))

 /* Min/max value expressed in picos (int64_t) which can be stored in a TimeInterval type */
 #define TIME_INTERVAL_MIN_PICOS_VALUE_AS_INT64 ((int64_t) 0xFE0C000000000000)

--- a/include/ppsi/pp-time.h
+++ b/include/ppsi/pp-time.h
@@ -4,7 +4,7 @@
 #define TIME_FRACBITS 16
 #define TIME_FRACMASK 0xFFFF
 #define TIME_FRACBITS_AS_FLOAT 16.0
-#define TIME_ROUNDING_VALUE (1<<(TIME_FRACBITS-1))
+#define TIME_ROUNDING_VALUE ((uint64_t)1<<(TIME_FRACBITS-1))

 /* Everything internally uses this time format, *signed* */
 struct pp_time {

--- a/lib/time-arith.c
+++ b/lib/time-arith.c
@@ -178,7 +178,7 @@ TimeInterval picos_to_interval(int64_t picos)

 int64_t interval_to_picos(TimeInterval interval)
 {
-	return (interval * 1000) >>  TIME_INTERVAL_FRACBITS;
+	return (((interval * (int64_t)1000) + TIME_INTERVAL_ROUNDING_VALUE) >> TIME_INTERVAL_FRACBITS);
 }

 /*