From 41fa8e9d32342ed27e2ae6040d76f3014efecb22 Mon Sep 17 00:00:00 2001 From: Peter Schneider Date: Sun, 15 Apr 2018 21:13:52 +0200 Subject: [PATCH] phc2sys.c: Sync variable 'node.clock_servo with cfg item Use struct config item 'clock_servo' for parameter handling. Copy this to node.servo_type afterwards. Signed-off-by: Peter Schneider --- phc2sys.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/phc2sys.c b/phc2sys.c index 745b5c9..47284b4 100644 --- a/phc2sys.c +++ b/phc2sys.c @@ -1350,7 +1350,6 @@ int main(int argc, char *argv[]) double phc_rate, tmp; struct node node = { .sanity_freq_limit = 200000000, - .servo_type = CLOCK_SERVO_PI, .phc_readings = 5, .phc_interval = 1.0, .kernel_leap = 1, @@ -1397,11 +1396,14 @@ int main(int argc, char *argv[]) break; case 'E': if (!strcasecmp(optarg, "pi")) { - node.servo_type = CLOCK_SERVO_PI; + config_set_int(cfg, "clock_servo", + CLOCK_SERVO_PI); } else if (!strcasecmp(optarg, "linreg")) { - node.servo_type = CLOCK_SERVO_LINREG; + config_set_int(cfg, "clock_servo", + CLOCK_SERVO_LINREG); } else if (!strcasecmp(optarg, "ntpshm")) { - node.servo_type = CLOCK_SERVO_NTPSHM; + config_set_int(cfg, "clock_servo", + CLOCK_SERVO_NTPSHM); } else { fprintf(stderr, "invalid servo name %s\n", optarg); @@ -1541,6 +1543,7 @@ int main(int argc, char *argv[]) print_set_verbose(config_get_int(cfg, NULL, "verbose")); print_set_syslog(config_get_int(cfg, NULL, "use_syslog")); print_set_level(config_get_int(cfg, NULL, "logging_level")); + node.servo_type = config_get_int(cfg, NULL, "clock_servo"); if (autocfg) { if (init_pmc(cfg, &node))