Skip to content

P
PPSi
Commit 63eb7add authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

removed some unused fields and constants 

Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent b7862cd7
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 14 deletions
include/ppsi/constants.h
View file @ 63eb7add
......@@ -14,20 +14,15 @@
#define PP_DEFAULT_OUTBOUND_LATENCY 0 /* in nsec */
#define PP_DEFAULT_NO_RESET_CLOCK 0
#define PP_DEFAULT_ETHERNET_MODE 0
#define PP_DEFAULT_GPTP_MODE 0
#define PP_DEFAULT_DOMAIN_NUMBER 0
#define PP_DEFAULT_AP 10
#define PP_DEFAULT_AI 120
#define PP_DEFAULT_DELAY_S 6
#define PP_DEFAULT_ANNOUNCE_INTERVAL 1 /* 0 in 802.1AS, 3 is ok */
#define PP_DEFAULT_UTC_VALID 0
#define PP_DEFAULT_DELAYREQ_INTERVAL 0 /* 3 is ok */
#define PP_DEFAULT_SYNC_INTERVAL 0 /* -7 in 802.1AS, 1 is ok */
#define PP_DEFAULT_SYNC_RECEIPT_TIMEOUT 3
#define PP_DEFAULT_ANNOUNCE_RECEIPT_TIMEOUT 6 /* 3 by default, 3 is ok */
#define PP_DEFAULT_QUALIFICATION_TIMEOUT 2
#define PP_DEFAULT_FOREIGN_MASTER_TIME_WINDOW 4
#define PP_DEFAULT_FOREIGN_MASTER_THRESHOLD 2
#define PP_DEFAULT_CLOCK_CLASS 248
#define PP_DEFAULT_CLOCK_ACCURACY 0xFE
#define PP_DEFAULT_PRIORITY1 248
......@@ -37,7 +32,6 @@
* same value as in ptpdv1
*/
#define PP_NR_FOREIGN_RECORDS 5
#define PP_DEFAULT_PARENTS_STATS 0
#define PP_DEFAULT_MAX_RESET 0
#define PP_DEFAULT_MAX_DELAY 0
#define PP_DEFAULT_NO_ADJUST 0
......@@ -77,15 +71,12 @@ enum pp_timeouts {
#define PP_DEFAULT_NEXT_DELAY_MS 1000
/* UDP/IPv4 dependent */
#define PP_SUBDOMAIN_ADDRESS_LENGTH 4
#define PP_PORT_ADDRESS_LENGTH 2
#define PP_UUID_LENGTH 6
#define PP_FLAG_FIELD_LENGTH 2
#define PP_EVT_PORT 319
#define PP_GEN_PORT 320
#define PP_DEFAULT_DOMAIN_ADDRESS "224.0.1.129"
#define PP_PDELAY_DOMAIN_ADDRESS "224.0.0.107"
#define PP_MM_STARTING_BOUNDARY_HOPS 0x7fff
/* Raw ethernet dependent */
#ifndef ETH_P_1588
......
include/ppsi/ieee1588_types.h
View file @ 63eb7add
......@@ -239,7 +239,7 @@ typedef struct DSCurrent { /* page 67 */
typedef struct DSParent { /* page 68 */
/* Dynamic */
PortIdentity parentPortIdentity;
Boolean parentStats;
/* Boolean parentStats; -- not used */
UInteger16 observedParentOffsetScaledLogVariance;
Integer32 observedParentClockPhaseChangeRate;
ClockIdentity grandmasterIdentity;
......@@ -255,12 +255,12 @@ typedef struct DSPort { /* page 72 */
/* Dynamic */
Enumeration8 portState;
Integer8 logMinDelayReqInterval; /* note: never changed */
TimeInternal peerMeanPathDelay;
/* TimeInternal peerMeanPathDelay; -- not used */
/* Configurable */
Integer8 logAnnounceInterval;
UInteger8 announceReceiptTimeout;
Integer8 logSyncInterval;
Enumeration8 delayMechanism;
/* Enumeration8 delayMechanism; -- not used */
UInteger4 versionNumber;
void *ext_dsport;
......
proto-standard/bmc.c
View file @ 63eb7add
......@@ -26,7 +26,6 @@ void m1(struct pp_instance *ppi)
memcpy(DSPAR(ppi)->parentPortIdentity.clockIdentity,
DSDEF(ppi)->clockIdentity, PP_CLOCK_IDENTITY_LENGTH);
DSPAR(ppi)->parentPortIdentity.portNumber = 0;
DSPAR(ppi)->parentStats = PP_DEFAULT_PARENTS_STATS;
DSPAR(ppi)->observedParentClockPhaseChangeRate = 0;
DSPAR(ppi)->observedParentOffsetScaledLogVariance = 0;
memcpy(DSPAR(ppi)->grandmasterIdentity, DSDEF(ppi)->clockIdentity,
......
proto-standard/state-initializing.c
View file @ 63eb7add
......@@ -55,7 +55,6 @@ int pp_initializing(struct pp_instance *ppi, unsigned char *pkt, int plen)
def->clockIdentity, PP_CLOCK_IDENTITY_LENGTH);
port->portIdentity.portNumber = 1;
port->logMinDelayReqInterval = PP_DEFAULT_DELAYREQ_INTERVAL;
clear_TimeInternal(&port->peerMeanPathDelay);
port->logAnnounceInterval = opt->announce_intvl;
port->announceReceiptTimeout = PP_DEFAULT_ANNOUNCE_RECEIPT_TIMEOUT;
port->logSyncInterval = opt->sync_intvl;
......
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