Skip to content

P
PPSi
Commit 1d0feef7 authored by Adam Wujek's avatar Adam Wujek
Browse files
Options

(no technical change) remove references to draft 1588 standard 

Signed-off-by: 's avatarAdam Wujek <dev_public@wujek.eu>
parent 20916338
Show whitespace changes
Inline Side-by-side
Showing with 42 additions and 41 deletions
include/ppsi/ieee1588_types.h
View file @ 1d0feef7
...@@ -85,7 +85,7 @@ typedef struct Timestamp { /* page 13 (33) -- no typedef expected */ ...@@ -85,7 +85,7 @@ typedef struct Timestamp { /* page 13 (33) -- no typedef expected */
#define RELATIVE_DIFFERENCE_MIN_VALUE_AS_DOUBLE -2.0 #define RELATIVE_DIFFERENCE_MIN_VALUE_AS_DOUBLE -2.0
#define RELATIVE_DIFFERENCE_MAX_VALUE_AS_DOUBLE 1.9999999999999989 #define RELATIVE_DIFFERENCE_MAX_VALUE_AS_DOUBLE 1.9999999999999989
/*draft P1588_v_29: page 17*/ /* 1588-2019 5.3.11 */
/* The scaledRelativeDifference member is the relative difference expressed /* The scaledRelativeDifference member is the relative difference expressed
* as a dimensionless fraction and multiplied by 2^+62, with any remaining * as a dimensionless fraction and multiplied by 2^+62, with any remaining
* fractional part truncated. */ * fractional part truncated. */
...@@ -280,13 +280,13 @@ typedef struct { /* page 72 */ ...@@ -280,13 +280,13 @@ typedef struct { /* page 72 */
void *ext_dsport; void *ext_dsport;
/** (IEEE1588-2019) */ /** (IEEE1588-2019) */
Integer8 logMinPdelayReqInterval; /*draft P1588_v_29: page 124 */ Integer8 logMinPdelayReqInterval; /* 1588-2019 8.2.15.4.5 */
UInteger4 minorVersionNumber; /*draft P1588_v_29: page 124 */ UInteger4 minorVersionNumber; /* 1588-2019 8.2.15.4.7 */
TimeInterval delayAsymmetry; /*draft P1588_v_29: page 124 */ TimeInterval delayAsymmetry; /* 1588-2019 8.2.15.4.8 */
TimeInterval meanLinkDelay; /* P2P: estimation of the current one-way propagation delay */ TimeInterval meanLinkDelay; /* 1588-2019 8.2.15.3.3 */
/** Optional: */ /** Optional: */
Boolean portEnable; /*draft P1588_v_29: page 124 */ Boolean portEnable; /* 1588-2019 8.2.15.5.1 */
Boolean masterOnly; /*draft P1588_v_29: page 124 */ Boolean masterOnly; /* 1588-2019 8.2.15.5.2 */
/** *********************** */ /** *********************** */
RelativeDifference delayAsymCoeff; /* alpha/(alpha+2). Used to compute delayAsymmetry */ RelativeDifference delayAsymCoeff; /* alpha/(alpha+2). Used to compute delayAsymmetry */
} portDS_t; } portDS_t;
...@@ -308,35 +308,36 @@ typedef struct { /* page 70 */ ...@@ -308,35 +308,36 @@ typedef struct { /* page 70 */
* Adding new optional data sets (DS) defined in clause, only these relevant * Adding new optional data sets (DS) defined in clause, only these relevant
* for HA * for HA
*/ */
typedef struct { /*draft P1588_v_29: page 118 */ typedef struct { /* 1588-2019 8.2.5.1 */
Octet manufacturerIdentity[3]; Octet manufacturerIdentity[3]; /* 1588-2019 8.2.5.2 */
struct PTPText productDescription; struct PTPText productDescription; /* 1588-2019 8.2.5.3 */
struct PTPText productRevision; struct PTPText productRevision; /* 1588-2019 8.2.5.4 */
struct PTPText userDescription; struct PTPText userDescription; /* 1588-2019 8.2.5.5 */
} descriptionDS_t; } descriptionDS_t;
/* Optional, not implemented, Instance DS: /* Optional, not implemented, Instance DS:
* faultLogDS: draft P1588_v_29: page 93 * faultLogDS
* nonvolatileStorageDS draft P1588_v_29: page 94 * nonVolatileStorageDS
* pathTraceDS draft P1588_v_29: page 95 * pathTraceDS
* alternateTimescaleOffsetsDS draft P1588_v_29: page 95 * alternateTimescaleOffsetsDS
* holdoverUpgradeDS draft P1588_v_29: page 95 * holdoverUpgradeDS
* grandmasterClusterDS draft P1588_v_29: page 95 * grandmasterClusterDS
* acceptableMasterTableDS draft P1588_v_29: page 95 * acceptableMasterTableDS
* clockPerformanceMonitoringDS draft P1588_v_29: page 95 * performanceMonitoringDS
* *
* Optional, not implemented, port DS * Optional, not implemented, port DS
* descriptionPortDS draft P1588_v_29: page 99 * descriptionPortDS
* unicastNegotiationDS draft P1588_v_29: page 100 * unicastNegotiationDS
* alternateMasterDS draft P1588_v_29: page 100 * alternateMasterDS
* unicastDiscoveryDS draft P1588_v_29: page 100 * unicastDiscoveryDS
* acceptableMasterPortDS draft P1588_v_29: page 100 * acceptableMasterPortDS
* performanceMonitoringPortDS draft P1588_v_29: page 101 * performanceMonitoringPortDS
* *
* For Transparent Clocks, not implemented * For Transparent Clocks, not implemented
* transparentClockDefaultDS draft P1588_v_29: page 102 * transparentClockDefaultDS
* transparentClockPortDS draft P1588_v_29: page 103 * transparentClockPortDS
*/ */
typedef struct { /*draft P1588_v_29: page 128*/ typedef struct { /* 1588-2019 8.2.16 */
TimeInterval egressLatency; TimeInterval egressLatency;
TimeInterval ingressLatency; TimeInterval ingressLatency;
TimeInterval messageTimestampPointLatency; TimeInterval messageTimestampPointLatency;
...@@ -344,14 +345,14 @@ typedef struct { /*draft P1588_v_29: page 128*/ ...@@ -344,14 +345,14 @@ typedef struct { /*draft P1588_v_29: page 128*/
TimeInterval semistaticLatency; TimeInterval semistaticLatency;
} timestampCorrectionPortDS_t; } timestampCorrectionPortDS_t;
typedef struct { /*draft P1588_v_29: page129*/ typedef struct { /* 1588-2019 8.2.17 */
TimeInterval constantAsymmetry; TimeInterval constantAsymmetry;
RelativeDifference scaledDelayCoefficient; RelativeDifference scaledDelayCoefficient;
Boolean enable; Boolean enable;
} asymmetryCorrectionPortDS_t; } asymmetryCorrectionPortDS_t;
typedef struct {/*draft P1588_v_29: Clause 17.6.3 */ typedef struct { /* 1588-2019 8.2.28 */
Enumeration8 desiredState; /* draft P1588_v_29: Clause 17.6.3.2 */ Enumeration8 desiredState; /* 1588-2019 17.6.3.2 */
}externalPortConfigurationPortDS_t; }externalPortConfigurationPortDS_t;
/** ************************************************************************/ /** ************************************************************************/
......
include/ppsi/pp-instance.h
View file @ 1d0feef7
...@@ -266,9 +266,9 @@ struct pp_instance { ...@@ -266,9 +266,9 @@ struct pp_instance {
struct pp_servo *servo; /* Servo moved from globals because we may have more than one servo : redundancy */ struct pp_servo *servo; /* Servo moved from globals because we may have more than one servo : redundancy */
/** (IEEE1588-2019) */ /** (IEEE1588-2019) */
asymmetryCorrectionPortDS_t asymmetryCorrectionPortDS; /*draft P1588_v_29: page 99*/ asymmetryCorrectionPortDS_t asymmetryCorrectionPortDS; /* 1588-2019 8.2.17 */
timestampCorrectionPortDS_t timestampCorrectionPortDS; /*draft P1588_v_29: page 99*/ timestampCorrectionPortDS_t timestampCorrectionPortDS; /* 1588-2019 8.2.16 */
externalPortConfigurationPortDS_t externalPortConfigurationPortDS; /*draft P1588: Clause 17.6.3*/ externalPortConfigurationPortDS_t externalPortConfigurationPortDS; /* 1588-2019 8.2.28 */
/************************* */ /************************* */
timeOutInstCnt_t tmo_cfg[PP_TO_COUNT]; timeOutInstCnt_t tmo_cfg[PP_TO_COUNT];
......
proto-ext-l1sync/l1e-api.h
View file @ 1d0feef7
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#define L1E_CONGRUENT 0x04 #define L1E_CONGRUENT 0x04
#define L1E_OPT_PARAMS 0x08 #define L1E_OPT_PARAMS 0x08
enum l1_sync_states { /*draft P1588_v_29: page 334 */ enum l1_sync_states { /* 1588-2019 L5.3.5, table L.1 */
__L1SYNC_MISSING = 0, /* my addition... */ //TODO: std-error->report in ballout __L1SYNC_MISSING = 0, /* my addition... */ //TODO: std-error->report in ballout
L1SYNC_DISABLED = 1, L1SYNC_DISABLED = 1,
L1SYNC_IDLE, L1SYNC_IDLE,
...@@ -54,7 +54,7 @@ int l1e_unpack_signal(struct pp_instance *ppi, void *pkt, int plen); ...@@ -54,7 +54,7 @@ int l1e_unpack_signal(struct pp_instance *ppi, void *pkt, int plen);
/* /*
* These structures are used as extension-specific data in the DSPort * These structures are used as extension-specific data in the DSPort
*/ */
typedef struct { /*draft P1588_v_29: page 100 and 333-335 */ typedef struct { /* 1588-2019 8.2.23 and L5.3 */
/* configurable members */ /* configurable members */
Boolean L1SyncEnabled; Boolean L1SyncEnabled;
Boolean txCoherentIsRequired; Boolean txCoherentIsRequired;
...@@ -79,7 +79,7 @@ typedef struct { /*draft P1588_v_29: page 100 and 333-335 */ ...@@ -79,7 +79,7 @@ typedef struct { /*draft P1588_v_29: page 100 and 333-335 */
Enumeration8 next_state; Enumeration8 next_state;
} L1SyncBasicPortDS_t; } L1SyncBasicPortDS_t;
typedef struct { /*draft P1588_v_29: page 101 and 340-341 */ typedef struct { /* 1588-2019 8.2.24 and L.8.4 */
/* configurable members */ /* configurable members */
Boolean timestampsCorrectedTx; Boolean timestampsCorrectedTx;
/* dynamic members */ /* dynamic members */
......
tools/dump_mem_ppsi_wrpc.c
View file @ 1d0feef7
...@@ -267,18 +267,18 @@ struct dump_info dump_ppsi_info[] = { ...@@ -267,18 +267,18 @@ struct dump_info dump_ppsi_info[] = {
DUMP_FIELD(pointer, portDS), DUMP_FIELD(pointer, portDS),
DUMP_FIELD(pointer, servo), DUMP_FIELD(pointer, servo),
/* dump of substructure asymmetryCorrectionPortDS_t; draft P1588_v_29: page 99*/ /* dump of substructure asymmetryCorrectionPortDS_t; 1588-2019 8.2.17 */
DUMP_FIELD(TimeInterval, asymmetryCorrectionPortDS.constantAsymmetry), DUMP_FIELD(TimeInterval, asymmetryCorrectionPortDS.constantAsymmetry),
DUMP_FIELD(RelativeDifference, asymmetryCorrectionPortDS.scaledDelayCoefficient), DUMP_FIELD(RelativeDifference, asymmetryCorrectionPortDS.scaledDelayCoefficient),
DUMP_FIELD(yes_no_Boolean, asymmetryCorrectionPortDS.enable), DUMP_FIELD(yes_no_Boolean, asymmetryCorrectionPortDS.enable),
/* dump of substructure timestampCorrectionPortDS_t; draft P1588_v_29: page 99 */ /* dump of substructure timestampCorrectionPortDS_t; 1588-2019 8.2.16 */
DUMP_FIELD(TimeInterval, timestampCorrectionPortDS.egressLatency), DUMP_FIELD(TimeInterval, timestampCorrectionPortDS.egressLatency),
DUMP_FIELD(TimeInterval, timestampCorrectionPortDS.ingressLatency), DUMP_FIELD(TimeInterval, timestampCorrectionPortDS.ingressLatency),
DUMP_FIELD(TimeInterval, timestampCorrectionPortDS.messageTimestampPointLatency), DUMP_FIELD(TimeInterval, timestampCorrectionPortDS.messageTimestampPointLatency),
DUMP_FIELD(TimeInterval, timestampCorrectionPortDS.semistaticLatency), DUMP_FIELD(TimeInterval, timestampCorrectionPortDS.semistaticLatency),
/* dump of substructure externalPortConfigurationPortDS_t; draft P1588: Clause 17.6.3*/ /* dump of substructure externalPortConfigurationPortDS_t; 1588-2019 8.2.28 */
DUMP_FIELD(ppi_state_Enumeration8, externalPortConfigurationPortDS.desiredState), DUMP_FIELD(ppi_state_Enumeration8, externalPortConfigurationPortDS.desiredState),
// timeOutInstCnt_t tmo_cfg[PP_TO_COUNT]; // timeOutInstCnt_t tmo_cfg[PP_TO_COUNT];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment