From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 20 Dec 2009 04:55:09 +0000 (-0500)
Subject: Put refclock_neoclock4x.c under the NTP COPYRIGHT
X-Git-Tag: NTP_4_2_6P1_RC1~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34467e0caf6bec698e630d83f764d753f60f7354;p=thirdparty%2Fntp.git

Put refclock_neoclock4x.c under the NTP COPYRIGHT

bk: 4b2dae2dTDdwHt6Q4BX7PTVnTKIaBw
---

diff --git a/ChangeLog b/ChangeLog
index f86c272ee..8ea143114 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 ---
 
+* [Bug 1409] Put refclock_neoclock4x.c under the NTP COPYRIGHT notice.
+  This should allow debian and other distros to add this refclock driver
+  in further distro releases.
+  Detect R2 hardware releases.
 * [Bug 1412] m4/os_cflags.m4 caches results that depend on $CC.
 * [Bug 1413] test OpenSSL headers regarding -Wno-strict-prototypes.
 * [Bug 1414] Enable "make distcheck" success with BSD make.
diff --git a/html/copyright.html b/html/copyright.html
index a49e5d186..d2b9211a7 100644
--- a/html/copyright.html
+++ b/html/copyright.html
@@ -56,6 +56,7 @@
 			<li class="inline"><a href="mailto:%20dennis@mrbill.canet.ca">Dennis Ferguson &lt;dennis@mrbill.canet.ca&gt;</a> foundation code for NTP Version 2 as specified in RFC-1119
 			<li class="inline"><a href="mailto:%20jhay@icomtek.csir.co.za">John Hay &lt;jhay@icomtek.csir.co.za&gt;</a> IPv6 support and testing
 			<li class="inline"><a href="mailto:%20davehart@davehart.com">Dave Hart &lt;davehart@davehart.com&gt;</a> General maintenance, Windows port interpolation rewrite.
+			<li class="inline"><a href="mailto:%20neoclock4x@linum.com">Claas Hilbrecht &lt;neoclock4x@linum.com&gt;</a> NeoClock4X clock driver
 			<li class="inline"><a href="mailto:%20glenn@herald.usask.ca">Glenn Hollinger &lt;glenn@herald.usask.ca&gt;</a> GOES clock driver
 			<li class="inline"><a href="mailto:%20iglesias@uci.edu">Mike Iglesias &lt;iglesias@uci.edu&gt;</a> DEC Alpha port
 			<li class="inline"><a href="mailto:%20jagubox.gsfc.nasa.gov">Jim Jagielski &lt;jim@jagubox.gsfc.nasa.gov&gt;</a> A/UX port
diff --git a/ntpd/refclock_neoclock4x.c b/ntpd/refclock_neoclock4x.c
index f13e50f16..c3d6033be 100644
--- a/ntpd/refclock_neoclock4x.c
+++ b/ntpd/refclock_neoclock4x.c
@@ -3,18 +3,11 @@
  * Refclock_neoclock4x.c
  * - NeoClock4X driver for DCF77 or FIA Timecode
  *
- * Date: 2006-01-11 v1.15
+ * Date: 2009-12-04 v1.16
  *
  * see http://www.linum.com/redir/jump/id=neoclock4x&action=redir
  * for details about the NeoClock4X device
  *
- * Copyright (C) 2002-2004 by Linum Software GmbH <neoclock4x@linum.com>
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- *
  */
 
 #ifdef HAVE_CONFIG_H
@@ -109,7 +102,7 @@
 #define NEOCLOCK4X_OFFSET_ANTENNA2         33
 #define NEOCLOCK4X_OFFSET_CRC              35
 
-#define NEOCLOCK4X_DRIVER_VERSION          "1.15 (2006-01-11)"
+#define NEOCLOCK4X_DRIVER_VERSION          "1.16 (2009-12-04)"
 
 #define NSEC_TO_MILLI                      1000000
 
@@ -1024,6 +1017,12 @@ neol_query_firmware(int fd,
     {
       NLOG(NLOG_CLOCKINFO)
 	msyslog(LOG_INFO, "NeoClock4X(%d): firmware version: %s", unit, firmware);
+
+      if(strstr(firmware, "/R2"))
+	{
+	  msyslog(LOG_INFO, "NeoClock4X(%d): Your NeoClock4X uses the new R2 firmware release. Please note the changed LED behaviour.", unit);
+	}
+
     }
 
   return (flag);
@@ -1110,4 +1109,16 @@ int refclock_neoclock4x_bs;
  * - remove some unsued #ifdefs
  * - fix nsec calculation, closes #499
  *
+ * 2009/12/04 cjh
+ * Revision 1.16
+ * - change license to ntp COPYRIGHT notice. This should allow Debian
+ *   to add this refclock driver in further releases.
+ * - detect R2 hardware
+ *
  */
+
+
+
+
+
+