ChangeLog, ntp_config.c, refclock_hopfpci.c:

  * ntpd/ntp_config.c: Add the "allan" tinker variable.
  From: Juha Sarlin <juha@c3l.tyreso.se>
  * ntpd/refclock_hopfpci.c (hopfpci_start): Lose the "correct_any"
  stuff - it's both obsolete and wrong.

bk: 3ae779c8l9IBGC3vQw-m9TY5kKsm6w

diff --git a/ChangeLog b/ChangeLog
index d1c977faf61b1ad68ab59b716782514a0c9fa8d4..920468b89bbfa478e4ce8f49d2bd62cc9afaf070 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2001-04-25  Harlan Stenn  <stenn@whimsy.udel.edu>
 
+       * ntpd/ntp_config.c: Add the "allan" tinker variable.
+       From: Juha Sarlin <juha@c3l.tyreso.se>
+
+       * ntpd/refclock_hopfpci.c (hopfpci_start): Lose the "correct_any"
+       stuff - it's both obsolete and wrong.
+
        * ntpd/ntp_proto.c (receive): Keep track of packet versions.
        Implement RES_LIMITED.
        * include/ntp_config.h (CONF_RES_LIMITED): 

diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c
index 4ba3aa98de0ee42afde3fd72a2cd9fef87ae431a..d1a7a831468333a11a71e7f974339a2ba12b69b1 100644 (file)
--- a/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@ -266,6 +266,7 @@ static struct keyword tinker_keywords[] = {
        { "dispersion",         CONF_CLOCK_PHI },
        { "stepout",            CONF_CLOCK_MINSTEP },
        { "minpoll",            CONF_CLOCK_MINPOLL },
+       { "allan",              CONF_CLOCK_ALLAN },
        { "",                   CONFIG_UNKNOWN }
 };
 
@@ -953,6 +954,10 @@ getconfig(
                            case CONF_CLOCK_MINPOLL:
                                loop_config(LOOP_MINPOLL, ftemp);
                                break;
+
+                           case CONF_CLOCK_ALLAN:
+                               loop_config(LOOP_ALLAN, ftemp);
+                               break;
                            }
                        }
                        break;

diff --git a/ntpd/refclock_hopfpci.c b/ntpd/refclock_hopfpci.c
index 2a8909a39878426487fe6995feef5a840fd89666..a9deb21c17dca9b7329792669e183131fc09591c 100644 (file)
--- a/ntpd/refclock_hopfpci.c
+++ b/ntpd/refclock_hopfpci.c
@@ -78,10 +78,6 @@
 #define HOPF_RADIO     0x80    /* radio clock */
 #define HOPF_RADIOHP   0xC0    /* high precision radio clock */
 
-/*
- * Imported from ntpd module
- */
-extern int correct_any;                /* if TRUE, correct offset > 1000 s */
 
 /*
  * hopfclock unit control structure.
@@ -158,8 +154,6 @@ hopfpci_start(
 
        get_systime(&pp->lastrec);
 
-       correct_any = TRUE;
-
        /*
         * Initialize miscellaneous peer variables
         */