Bug fix: Error in servo calculation for negative delay asymmetry

- Problem was coming from the interval to pico conversion when the interval is negative. - fix also issue in wrs_ajust_in_progress

Bug fix: Error in servo calculation for negative delay asymmetry
- Problem was coming from the interval to pico conversion when the interval is negative. - fix also issue in wrs_ajust_in_progress
b2195fc0 · Jean-Claude BAU · 98746394 · b2195fc0 · b2195fc0 · b2195fc0
Commit b2195fc0 authored Jun 14, 2019 by Jean-Claude BAU
Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 7 deletions

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

servo.c proto-standard/servo.c +1 -2

wrs-time.c time-wrs/wrs-time.c +5 -4

No files found.
--- a/lib/time-arith.c
+++ b/lib/time-arith.c
@@ -178,7 +178,17 @@ TimeInterval picos_to_interval(int64_t picos)
 int64_t interval_to_picos(TimeInterval interval)
 {
-	return (((interval * (int64_t)1000) + TIME_INTERVAL_ROUNDING_VALUE) >> TIME_INTERVAL_FRACBITS);
+	int neg;
+	int64_t picos;
+	if ( interval < 0 ) {
+		neg=1;
+		interval=-interval;
+	} else
+		neg=0;
+	picos=(((interval * (int64_t)1000) + TIME_INTERVAL_ROUNDING_VALUE) >> TIME_INTERVAL_FRACBITS);
+	return neg ? -picos : picos;
 }
 /*

--- a/proto-standard/servo.c
+++ b/proto-standard/servo.c
@@ -268,8 +268,7 @@ int pp_servo_calculate_delays(struct pp_instance *ppi) {
 	}
 	/* delayMS = meanDelay + delayAsym */
 	delayMS_ps = meanDelay_ps + interval_to_picos(ppi->portDS->delayAsymmetry);
-	picos_to_pp_time(delayMS_ps, &SRV(ppi)->delayMS);
+	picos_to_pp_time(delayMS_ps, &servo->delayMS);
 	/* Calculate offsetFromMaster : t1-t2+meanDelay+delayAsym=t1-t2+delayMS */
 	servo->offsetFromMaster = servo->t1;
 	pp_time_sub(&servo->offsetFromMaster, &servo->t2);

--- a/time-wrs/wrs-time.c
+++ b/time-wrs/wrs-time.c
@@ -96,6 +96,8 @@ int wrs_adjust_phase(int32_t phase_ps)
 	return rval;
 }
+/* return a value > 0 if an adjustment is in progress */
+/* return -1 in case of error */
 int wrs_adjust_in_progress(void)
 {
 	hexp_pps_params_t p;
@@ -104,12 +106,11 @@ int wrs_adjust_in_progress(void)
 	ret = minipc_call(hal_ch, DEFAULT_TO, &__rpcdef_pps_cmd,
 		&rval, HEXP_PPSG_CMD_POLL, &p);
-	if ((ret < 0) || rval) {
+	if (ret < 0) {
 		COMM_ERR_MSG(NULL);
-		return 0;
+		return -1;
 	}
+	return rval ;
-	return 1;
 }
 int wrs_enable_ptracker(struct pp_instance *ppi)