Add scaledDelayCoefficient parameter in the configuration

The delayCoefficient can be set in ppsi.conf file either with the delayCoefficient (double) parameter or the scaledDelayCoefficient (RelativeDifference) parameter. In ppsi, the priority is given to the scaledDelayCoefficient.

Add scaledDelayCoefficient parameter in the configuration
The delayCoefficient can be set in ppsi.conf file either with the delayCoefficient (double) parameter or the scaledDelayCoefficient (RelativeDifference) parameter. In ppsi, the priority is given to the scaledDelayCoefficient.
dd417ad8 · Jean-Claude BAU · dfe9cdf5 · dd417ad8 · dd417ad8 · dd417ad8
Commit dd417ad8 authored Nov 29, 2018 by Jean-Claude BAU
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

wrs-startup.c arch-wrs/wrs-startup.c +3 -1

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

conf.c lib/conf.c +2 -0

open-close.c proto-standard/open-close.c +1 -0

No files found.
--- a/arch-wrs/wrs-startup.c
+++ b/arch-wrs/wrs-startup.c
@@ -103,7 +103,9 @@ static void enable_asymmetryCorrection(struct pp_instance *ppi, Boolean enable )
 	if ( (ppi->asymmetryCorrectionPortDS.enable=enable)==TRUE ) {
 		/* Enabled: The delay asymmetry will be calculated */
 		ppi->asymmetryCorrectionPortDS.scaledDelayCoefficient=
-				(RelativeDifference)(ppi->cfg.delayCoefficient * REL_DIFF_TWO_POW_FRACBITS);
+				ppi->cfg.scaledDelayCoefficient != 0 ?
+						ppi->cfg.scaledDelayCoefficient :
+						(RelativeDifference)(ppi->cfg.delayCoefficient * REL_DIFF_TWO_POW_FRACBITS);
 		ppi->portDS->delayAsymCoeff=(RelativeDifference)(calculateDelayAsymCoefficient(ppi->cfg.delayCoefficient) * REL_DIFF_TWO_POW_FRACBITS);
 	} else {
 		/* Disabled: The delay asymmetry will be provided by the config (constantAsymmetry) */

--- a/include/ppsi/ieee1588_types.h
+++ b/include/ppsi/ieee1588_types.h
@@ -76,6 +76,8 @@ typedef struct Timestamp { /* page 13 (33) -- no typedef expected */
 #define REL_DIFF_TWO_POW_FRACBITS  ((double)4.611686018427388E18) /* double value returned by pow(2.0,62.0) */

 /* Min/max values for  RelativeDifference type */
+#define RELATIVE_DIFFERENCE_MIN_VALUE  INT64_MIN
+#define RELATIVE_DIFFERENCE_MAX_VALUE  INT64_MAX
 #define RELATIVE_DIFFERENCE_MIN_VALUE_AS_DOUBLE -2.0
 #define RELATIVE_DIFFERENCE_MAX_VALUE_AS_DOUBLE 1.9999999999999989


--- a/lib/conf.c
+++ b/lib/conf.c
@@ -342,6 +342,8 @@ static struct pp_argline pp_global_arglines[] = {
 			TIME_INTERVAL_MIN_PICOS_VALUE_AS_INT64,TIME_INTERVAL_MAX_PICOS_VALUE_AS_INT64),
 	INST_OPTION_INT64_RANGE("ingressLatency", ARG_INT64, NULL,cfg.ingressLatency_ps,
 			TIME_INTERVAL_MIN_PICOS_VALUE_AS_INT64,TIME_INTERVAL_MAX_PICOS_VALUE_AS_INT64),
+	INST_OPTION_INT64_RANGE("scaledDelayCoefficient", ARG_INT64, NULL,cfg.scaledDelayCoefficient,
+			RELATIVE_DIFFERENCE_MIN_VALUE,RELATIVE_DIFFERENCE_MAX_VALUE),
 	INST_OPTION_DOUBLE_RANGE("delayCoefficient", ARG_DOUBLE, NULL,cfg.delayCoefficient,
 			RELATIVE_DIFFERENCE_MIN_VALUE_AS_DOUBLE,RELATIVE_DIFFERENCE_MAX_VALUE_AS_DOUBLE),
 	RT_OPTION_INT_RANGE("clock-class", ARG_INT, NULL, clock_quality.clockClass,

--- a/proto-standard/open-close.c
+++ b/proto-standard/open-close.c
@@ -51,6 +51,7 @@ struct pp_instance_cfg __pp_default_instance_cfg = {
 		.egressLatency_ps=0,
 		.ingressLatency_ps=0,
 		.constantAsymmetry_ps=0,
+		.scaledDelayCoefficient=0,
 		.delayCoefficient=0,
 		.desiredState=PPS_PASSIVE, /* Clause 17.3.6.2 ; The default value should be PASSIVE unless otherwise specified */
 		.masterOnly=FALSE