From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 26 Apr 2001 01:28:40 +0000 (-0000)
Subject: ChangeLog, ntp_config.c, refclock_hopfpci.c:
X-Git-Tag: NTP_4_0_99_M~39
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bf29b629dbff11b225a0560bbdc37c77515333ca;p=thirdparty%2Fntp.git

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 d1c977faf6..920468b89b 100644
--- 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 4ba3aa98de..d1a7a83146 100644
--- 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 2a8909a398..a9deb21c17 100644
--- 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
 	 */