From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 13 Sep 1999 04:00:08 +0000 (-0000)
Subject: ChangeLog, ntp_proto.c, ntp_refclock.c:
X-Git-Tag: NTP_4_0_98~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=703bcbbde740b5253327d0299cc0050f5882cf6e;p=thirdparty%2Fntp.git

ChangeLog, ntp_proto.c, ntp_refclock.c:
  * ntpd/ntp_refclock.c (refclock_ioctl): Declaration cleanup.
  Dave patched some PPS stuff in this one, too.
  * ntpd/ntp_proto.c (init_proto): msyslog kern_enable at LOG_DEBUG.

bk: 37dc76c84aMAhgMG0PRi3NCpd9W00Q
---

diff --git a/ChangeLog b/ChangeLog
index bc6d4e63d..47ecc291d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 1999-09-12  Harlan Stenn  <stenn@whimsy.udel.edu>
 
+	* ntpd/ntp_refclock.c (refclock_ioctl): Declaration cleanup.
+
+	* ntpd/ntp_proto.c (init_proto): msyslog kern_enable at LOG_DEBUG.
+
 	* ntpd/refclock_atom.c: Add missing declaration.
 
 1999-09-11  Harlan Stenn  <stenn@whimsy.udel.edu>
diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index 6fec8e30c..ff006fe82 100644
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -2025,6 +2025,7 @@ init_proto(void)
 #ifndef KERNEL_FLL_BUG
 	kern_enable = 1;
 #endif
+	msyslog(LOG_DEBUG, "kern_enable is %d", kern_enable);
 	stats_control = 1;
 #if defined SCO5_CLOCK
 	if ((int) sys_precision < -10) {
diff --git a/ntpd/ntp_refclock.c b/ntpd/ntp_refclock.c
index 5cd58b0d6..bfdfdce3a 100644
--- a/ntpd/ntp_refclock.c
+++ b/ntpd/ntp_refclock.c
@@ -19,6 +19,11 @@
 
 #ifdef REFCLOCK
 
+#ifdef HAVE_PPSAPI
+#undef STREAM
+#undef TTYCLK
+#endif
+
 #ifdef TTYCLK
 #include <sys/clkdefs.h>
 #endif /* TTYCLK */
@@ -1034,7 +1039,9 @@ refclock_ioctl(
 	 * support.
 	 */
 	if (flags & LDISC_PPS) {
+#ifdef HAVE_TIOCSPPS		/* Solaris */
 		int one = 1;
+#endif
 
 		if (fdpps > 0) {
 			msyslog(LOG_ERR,
@@ -1093,7 +1100,7 @@ refclock_ioctl(
 	 * requires ppsclock compiled into the kernel on non STREAMS
 	 * systems.
 	 */
-	if (flags & LDISC_PPS) {
+	if (flags & (LDISC_PPS | LDISC_CLKPPS)) {
 		pps_params_t	pp;
 		int mode;