From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 28 May 2001 01:49:17 +0000 (-0000)
Subject: ChangeLog, ntp_refclock.h:
X-Git-Tag: NTP_4_0_99_M~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=397db02b7503eafed5e4c0c33a8cef2a4339a9ad;p=thirdparty%2Fntp.git

ChangeLog, ntp_refclock.h:
  * include/ntp_refclock.h: Median Filter (SAMPLE - macro) - change
  to use most recent MAXSTAGE entries when the filter overflows (ie
  driver poking say once per second with poll > MAXSTAGE) rather
  than blocking after MAXSTAGE entries (turf oldest rather than turf
  most recent).
  From: John Woolner <vk1et@tpg.com.au>
ChangeLog, aclocal.m4, configure, configure.in:
  * configure.in: 4.0.99k40

bk: 3b11ae9dTS8WBsPXSyt7aI7A7-M7wA
---

diff --git a/ChangeLog b/ChangeLog
index cee7d4e4c..aab55a4e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2001-05-27  Harlan Stenn  <stenn@whimsy.udel.edu>
 
+	* configure.in: 4.0.99k40
+
+	* include/ntp_refclock.h: Median Filter (SAMPLE - macro) - change
+	to use most recent MAXSTAGE entries when the filter overflows (ie
+	driver poking say once per second with poll > MAXSTAGE) rather
+	than blocking after MAXSTAGE entries (turf oldest rather than turf
+	most recent).
+	From: John Woolner <vk1et@tpg.com.au>
+
 	* ntpd/refclock_true.c:
 	   a. Don't cream pp->a_lastcode when we get a <cr><lf> pair 
 	   b. Fix up pp->leap handling to work correctly 
diff --git a/configure b/configure
index 4c98c6722..f42908061 100755
--- a/configure
+++ b/configure
@@ -1377,7 +1377,7 @@ fi
 
 # Define the identity of the package.
 PACKAGE=ntp
-VERSION=4.0.99k39
+VERSION=4.0.99k40
 
 cat >>confdefs.h <<EOF
 #define PACKAGE "$PACKAGE"
diff --git a/configure.in b/configure.in
index f2b27ffc8..c3ebd7ada 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AC_CANONICAL_SYSTEM
 AC_DEFINE_UNQUOTED(STR_SYSTEM, "$target")
 AM_CONFIG_HEADER(config.h)
 AC_ARG_PROGRAM
-AM_INIT_AUTOMAKE(ntp, 4.0.99k39)
+AM_INIT_AUTOMAKE(ntp, 4.0.99k40)
 AC_PREREQ(2.49)
 
 ac_cv_var_oncore_ok=no
diff --git a/include/ntp_refclock.h b/include/ntp_refclock.h
index f436c0619..3995e9a1a 100644
--- a/include/ntp_refclock.h
+++ b/include/ntp_refclock.h
@@ -44,10 +44,9 @@
 #define BSD_TTYS
 #endif /* SYSV_TTYS STREAM BSD_TTYS */
 
-#define SAMPLE(x)	if ((pp->coderecv + 1) % MAXSTAGE !=		\
-			    pp->codeproc % MAXSTAGE)			\
-				pp->filter[pp->coderecv++ % MAXSTAGE] =	\
-				    (x);
+#define SAMPLE(x)	pp->filter[pp->coderecv++ % MAXSTAGE] = (x); \
+			if (pp->coderecv % MAXSTAGE == pp->codeproc % MAXSTAGE) \
+				pp->codeproc++;
 
 /*
  * Macros to determine the clock type and unit numbers from a