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

config: convert the 'check_fup_sync' option to the new scheme. 

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
master
Richard Cochran 2015-08-12 12:02:52 +02:00
parent 42dda4d2b7
commit a4329f7873
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config.c
View File

@ -78,6 +78,7 @@ struct config_item {
struct config_item config_tab[] = { struct config_item config_tab[] = {
GLOB_ITEM_INT("assume_two_step", 0, 0, 1), GLOB_ITEM_INT("assume_two_step", 0, 0, 1),
GLOB_ITEM_INT("check_fup_sync", 0, 0, 1),
GLOB_ITEM_INT("tx_timestamp_timeout", 1, 1, INT_MAX), GLOB_ITEM_INT("tx_timestamp_timeout", 1, 1, INT_MAX),
PORT_ITEM_INT("udp_ttl", 1, 1, 255), PORT_ITEM_INT("udp_ttl", 1, 1, 255),
}; };
@ -520,12 +521,6 @@ static enum parser_result parse_global_setting(const char *option,
cfg->dds.freq_est_interval = val; cfg->dds.freq_est_interval = val;
pod->freq_est_interval = val; pod->freq_est_interval = val;
} else if (!strcmp(option, "check_fup_sync")) {
r = get_ranged_int(value, &val, 0, 1);
if (r != PARSED_OK)
return r;
*cfg->check_fup_sync = val;
} else if (!strcmp(option, "pi_proportional_const")) { } else if (!strcmp(option, "pi_proportional_const")) {
r = get_ranged_double(value, &df, 0.0, DBL_MAX); r = get_ranged_double(value, &df, 0.0, DBL_MAX);
if (r != PARSED_OK) if (r != PARSED_OK)

2
config.h
View File

@ -70,8 +70,6 @@ struct config {
struct default_ds dds; struct default_ds dds;
struct port_defaults pod; struct port_defaults pod;
int *check_fup_sync;
enum servo_type clock_servo; enum servo_type clock_servo;
double *step_threshold; double *step_threshold;

4
ptp4l.c
View File

@ -101,9 +101,6 @@ static struct config cfg_settings = {
.timestamping = TS_HARDWARE, .timestamping = TS_HARDWARE,
.dm = DM_E2E, .dm = DM_E2E,
.transport = TRANS_UDP_IPV4, .transport = TRANS_UDP_IPV4,
.check_fup_sync = &sk_check_fupsync,
.clock_servo = CLOCK_SERVO_PI, .clock_servo = CLOCK_SERVO_PI,
.step_threshold = &servo_step_threshold, .step_threshold = &servo_step_threshold,
@ -280,6 +277,7 @@ int main(int argc, char *argv[])
} }
assume_two_step = config_get_int(cfg, NULL, "assume_two_step"); assume_two_step = config_get_int(cfg, NULL, "assume_two_step");
sk_check_fupsync = config_get_int(cfg, NULL, "check_fup_sync");
sk_tx_timeout = config_get_int(cfg, NULL, "tx_timestamp_timeout"); sk_tx_timeout = config_get_int(cfg, NULL, "tx_timestamp_timeout");
if (!cfg_settings.dds.grand_master_capable && if (!cfg_settings.dds.grand_master_capable &&