Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
P
PPSi
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
50
Issues
50
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
PPSi
Commits
1d0feef7
Commit
1d0feef7
authored
Aug 07, 2023
by
Adam Wujek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(no technical change) remove references to draft 1588 standard
Signed-off-by:
Adam Wujek
<
dev_public@wujek.eu
>
parent
20916338
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
42 additions
and
41 deletions
+42
-41
ieee1588_types.h
include/ppsi/ieee1588_types.h
+33
-32
pp-instance.h
include/ppsi/pp-instance.h
+3
-3
l1e-api.h
proto-ext-l1sync/l1e-api.h
+3
-3
dump_mem_ppsi_wrpc.c
tools/dump_mem_ppsi_wrpc.c
+3
-3
No files found.
include/ppsi/ieee1588_types.h
View file @
1d0feef7
...
...
@@ -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_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
* as a dimensionless fraction and multiplied by 2^+62, with any remaining
* fractional part truncated. */
...
...
@@ -280,13 +280,13 @@ typedef struct { /* page 72 */
void
*
ext_dsport
;
/** (IEEE1588-2019) */
Integer8
logMinPdelayReqInterval
;
/*draft P1588_v_29: page 124
*/
UInteger4
minorVersionNumber
;
/*draft P1588_v_29: page 124
*/
TimeInterval
delayAsymmetry
;
/*draft P1588_v_29: page 124
*/
TimeInterval
meanLinkDelay
;
/* P2P: estimation of the current one-way propagation delay
*/
Integer8
logMinPdelayReqInterval
;
/* 1588-2019 8.2.15.4.5
*/
UInteger4
minorVersionNumber
;
/* 1588-2019 8.2.15.4.7
*/
TimeInterval
delayAsymmetry
;
/* 1588-2019 8.2.15.4.8
*/
TimeInterval
meanLinkDelay
;
/* 1588-2019 8.2.15.3.3
*/
/** Optional: */
Boolean
portEnable
;
/*draft P1588_v_29: page 124
*/
Boolean
masterOnly
;
/*draft P1588_v_29: page 124
*/
Boolean
portEnable
;
/* 1588-2019 8.2.15.5.1
*/
Boolean
masterOnly
;
/* 1588-2019 8.2.15.5.2
*/
/** *********************** */
RelativeDifference
delayAsymCoeff
;
/* alpha/(alpha+2). Used to compute delayAsymmetry */
}
portDS_t
;
...
...
@@ -308,35 +308,36 @@ typedef struct { /* page 70 */
* Adding new optional data sets (DS) defined in clause, only these relevant
* for HA
*/
typedef
struct
{
/*
draft P1588_v_29: page 118
*/
Octet
manufacturerIdentity
[
3
];
struct
PTPText
productDescription
;
struct
PTPText
productRevision
;
struct
PTPText
userDescription
;
typedef
struct
{
/*
1588-2019 8.2.5.1
*/
Octet
manufacturerIdentity
[
3
];
/* 1588-2019 8.2.5.2 */
struct
PTPText
productDescription
;
/* 1588-2019 8.2.5.3 */
struct
PTPText
productRevision
;
/* 1588-2019 8.2.5.4 */
struct
PTPText
userDescription
;
/* 1588-2019 8.2.5.5 */
}
descriptionDS_t
;
/* Optional, not implemented, Instance DS:
* faultLogDS
: draft P1588_v_29: page 93
* non
volatileStorageDS draft P1588_v_29: page 94
* pathTraceDS
draft P1588_v_29: page 95
* alternateTimescaleOffsetsDS
draft P1588_v_29: page 95
* holdoverUpgradeDS
draft P1588_v_29: page 95
* grandmasterClusterDS
draft P1588_v_29: page 95
* acceptableMasterTableDS
draft P1588_v_29: page 95
*
clockPerformanceMonitoringDS draft P1588_v_29: page 95
* faultLogDS
* non
VolatileStorageDS
* pathTraceDS
* alternateTimescaleOffsetsDS
* holdoverUpgradeDS
* grandmasterClusterDS
* acceptableMasterTableDS
*
performanceMonitoringDS
*
* Optional, not implemented, port DS
* descriptionPortDS
draft P1588_v_29: page 99
* unicastNegotiationDS
draft P1588_v_29: page 100
* alternateMasterDS
draft P1588_v_29: page 100
* unicastDiscoveryDS
draft P1588_v_29: page 100
* acceptableMasterPortDS
draft P1588_v_29: page 100
* performanceMonitoringPortDS
draft P1588_v_29: page 101
* descriptionPortDS
* unicastNegotiationDS
* alternateMasterDS
* unicastDiscoveryDS
* acceptableMasterPortDS
* performanceMonitoringPortDS
*
* For Transparent Clocks, not implemented
* transparentClockDefaultDS
draft P1588_v_29: page 102
* transparentClockPortDS
draft P1588_v_29: page 103
* transparentClockDefaultDS
* transparentClockPortDS
*/
typedef
struct
{
/*
draft P1588_v_29: page 128
*/
typedef
struct
{
/*
1588-2019 8.2.16
*/
TimeInterval
egressLatency
;
TimeInterval
ingressLatency
;
TimeInterval
messageTimestampPointLatency
;
...
...
@@ -344,14 +345,14 @@ typedef struct { /*draft P1588_v_29: page 128*/
TimeInterval
semistaticLatency
;
}
timestampCorrectionPortDS_t
;
typedef
struct
{
/*
draft P1588_v_29: page129
*/
typedef
struct
{
/*
1588-2019 8.2.17
*/
TimeInterval
constantAsymmetry
;
RelativeDifference
scaledDelayCoefficient
;
Boolean
enable
;
}
asymmetryCorrectionPortDS_t
;
typedef
struct
{
/*draft P1588_v_29: Clause 17.6.3
*/
Enumeration8
desiredState
;
/*
draft P1588_v_29: Clause
17.6.3.2 */
typedef
struct
{
/* 1588-2019 8.2.28
*/
Enumeration8
desiredState
;
/*
1588-2019
17.6.3.2 */
}
externalPortConfigurationPortDS_t
;
/** ************************************************************************/
...
...
include/ppsi/pp-instance.h
View file @
1d0feef7
...
...
@@ -266,9 +266,9 @@ struct pp_instance {
struct
pp_servo
*
servo
;
/* Servo moved from globals because we may have more than one servo : redundancy */
/** (IEEE1588-2019) */
asymmetryCorrectionPortDS_t
asymmetryCorrectionPortDS
;
/*
draft P1588_v_29: page 99
*/
timestampCorrectionPortDS_t
timestampCorrectionPortDS
;
/*
draft P1588_v_29: page 99
*/
externalPortConfigurationPortDS_t
externalPortConfigurationPortDS
;
/*
draft P1588: Clause 17.6.3
*/
asymmetryCorrectionPortDS_t
asymmetryCorrectionPortDS
;
/*
1588-2019 8.2.17
*/
timestampCorrectionPortDS_t
timestampCorrectionPortDS
;
/*
1588-2019 8.2.16
*/
externalPortConfigurationPortDS_t
externalPortConfigurationPortDS
;
/*
1588-2019 8.2.28
*/
/************************* */
timeOutInstCnt_t
tmo_cfg
[
PP_TO_COUNT
];
...
...
proto-ext-l1sync/l1e-api.h
View file @
1d0feef7
...
...
@@ -38,7 +38,7 @@
#define L1E_CONGRUENT 0x04
#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_DISABLED
=
1
,
L1SYNC_IDLE
,
...
...
@@ -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
*/
typedef
struct
{
/*
draft P1588_v_29: page 100 and 333-335
*/
typedef
struct
{
/*
1588-2019 8.2.23 and L5.3
*/
/* configurable members */
Boolean
L1SyncEnabled
;
Boolean
txCoherentIsRequired
;
...
...
@@ -79,7 +79,7 @@ typedef struct { /*draft P1588_v_29: page 100 and 333-335 */
Enumeration8
next_state
;
}
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 */
Boolean
timestampsCorrectedTx
;
/* dynamic members */
...
...
tools/dump_mem_ppsi_wrpc.c
View file @
1d0feef7
...
...
@@ -267,18 +267,18 @@ struct dump_info dump_ppsi_info[] = {
DUMP_FIELD
(
pointer
,
portDS
),
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
(
RelativeDifference
,
asymmetryCorrectionPortDS
.
scaledDelayCoefficient
),
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
.
ingressLatency
),
DUMP_FIELD
(
TimeInterval
,
timestampCorrectionPortDS
.
messageTimestampPointLatency
),
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
),
// timeOutInstCnt_t tmo_cfg[PP_TO_COUNT];
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment