chao
/
linuxptp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config: port: convert 'logMinPdelayReqInterval' to the new scheme. 

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
master
Richard Cochran 2015-08-15 11:02:22 +02:00
parent 0578e321fb
commit 639ce56fa0
4 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config.c
View File

@ -97,6 +97,7 @@ struct config_item config_tab[] = {
GLOB_ITEM_DBL("first_step_threshold", 0.00002, 0.0, DBL_MAX), GLOB_ITEM_DBL("first_step_threshold", 0.00002, 0.0, DBL_MAX),
PORT_ITEM_INT("logAnnounceInterval", 1, INT8_MIN, INT8_MAX), PORT_ITEM_INT("logAnnounceInterval", 1, INT8_MIN, INT8_MAX),
PORT_ITEM_INT("logMinDelayReqInterval", 0, INT8_MIN, INT8_MAX), PORT_ITEM_INT("logMinDelayReqInterval", 0, INT8_MIN, INT8_MAX),
PORT_ITEM_INT("logMinPdelayReqInterval", 0, INT8_MIN, INT8_MAX),
PORT_ITEM_INT("logSyncInterval", 0, INT8_MIN, INT8_MAX), PORT_ITEM_INT("logSyncInterval", 0, INT8_MIN, INT8_MAX),
GLOB_ITEM_INT("logging_level", LOG_INFO, PRINT_LEVEL_MIN, PRINT_LEVEL_MAX), GLOB_ITEM_INT("logging_level", LOG_INFO, PRINT_LEVEL_MIN, PRINT_LEVEL_MAX),
GLOB_ITEM_INT("max_frequency", 900000000, 0, INT_MAX), GLOB_ITEM_INT("max_frequency", 900000000, 0, INT_MAX),
@ -266,13 +267,7 @@ static enum parser_result parse_pod_setting(const char *option,
enum parser_result r; enum parser_result r;
if (!strcmp(option, "logMinPdelayReqInterval")) { if (!strcmp(option, "announceReceiptTimeout")) {
r = get_ranged_int(value, &val, INT8_MIN, INT8_MAX);
if (r != PARSED_OK)
return r;
pod->logMinPdelayReqInterval = val;
} else if (!strcmp(option, "announceReceiptTimeout")) {
r = get_ranged_uint(value, &uval, 2, UINT8_MAX); r = get_ranged_uint(value, &uval, 2, UINT8_MAX);
if (r != PARSED_OK) if (r != PARSED_OK)
return r; return r;

1
ds.h
View File

@ -125,7 +125,6 @@ struct portDS {
#define FRI_ASAP (-128) #define FRI_ASAP (-128)
struct port_defaults { struct port_defaults {
Integer8 logMinPdelayReqInterval;
UInteger8 announceReceiptTimeout; UInteger8 announceReceiptTimeout;
UInteger8 syncReceiptTimeout; UInteger8 syncReceiptTimeout;
UInteger8 transportSpecific; UInteger8 transportSpecific;

2
port.c
View File

@ -1451,7 +1451,7 @@ static int port_initialize(struct port *p)
p->syncReceiptTimeout = p->pod.syncReceiptTimeout; p->syncReceiptTimeout = p->pod.syncReceiptTimeout;
p->transportSpecific = p->pod.transportSpecific; p->transportSpecific = p->pod.transportSpecific;
p->logSyncInterval = config_get_int(cfg, p->name, "logSyncInterval"); p->logSyncInterval = config_get_int(cfg, p->name, "logSyncInterval");
p->logMinPdelayReqInterval = p->pod.logMinPdelayReqInterval; p->logMinPdelayReqInterval = config_get_int(cfg, p->name, "logMinPdelayReqInterval");
p->neighborPropDelayThresh = p->pod.neighborPropDelayThresh; p->neighborPropDelayThresh = p->pod.neighborPropDelayThresh;
p->min_neighbor_prop_delay = p->pod.min_neighbor_prop_delay; p->min_neighbor_prop_delay = p->pod.min_neighbor_prop_delay;

1
ptp4l.c
View File

@ -80,7 +80,6 @@ static struct config cfg_settings = {
}, },
.pod = { .pod = {
.logMinPdelayReqInterval = 0,
.announceReceiptTimeout = 3, .announceReceiptTimeout = 3,
.syncReceiptTimeout = 0, .syncReceiptTimeout = 0,
.transportSpecific = 0, .transportSpecific = 0,