From a4329f7873d4e32c867a9943e5662cb94b558da8 Mon Sep 17 00:00:00 2001 From: Richard Cochran Date: Wed, 12 Aug 2015 12:02:52 +0200 Subject: [PATCH] config: convert the 'check_fup_sync' option to the new scheme. Signed-off-by: Richard Cochran --- config.c | 7 +------ config.h | 2 -- ptp4l.c | 4 +--- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/config.c b/config.c index ad398c1..2cd2788 100644 --- a/config.c +++ b/config.c @@ -78,6 +78,7 @@ struct config_item { struct config_item config_tab[] = { 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), 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; 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")) { r = get_ranged_double(value, &df, 0.0, DBL_MAX); if (r != PARSED_OK) diff --git a/config.h b/config.h index 8e95561..b200c8c 100644 --- a/config.h +++ b/config.h @@ -70,8 +70,6 @@ struct config { struct default_ds dds; struct port_defaults pod; - int *check_fup_sync; - enum servo_type clock_servo; double *step_threshold; diff --git a/ptp4l.c b/ptp4l.c index 439058c..b2ac0d5 100644 --- a/ptp4l.c +++ b/ptp4l.c @@ -101,9 +101,6 @@ static struct config cfg_settings = { .timestamping = TS_HARDWARE, .dm = DM_E2E, .transport = TRANS_UDP_IPV4, - - .check_fup_sync = &sk_check_fupsync, - .clock_servo = CLOCK_SERVO_PI, .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"); + sk_check_fupsync = config_get_int(cfg, NULL, "check_fup_sync"); sk_tx_timeout = config_get_int(cfg, NULL, "tx_timestamp_timeout"); if (!cfg_settings.dds.grand_master_capable &&