From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 23 Sep 2000 20:21:38 +0000 (-0000)
Subject: ChangeLog, ntp_refclock.h, iosignal.c, ntp_refclock.c, ntpq_ops.c:
X-Git-Tag: NTP_4_0_99_M~158
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d69a7da86bbc770371825de1eafb2e571b20b1d1;p=thirdparty%2Fntp.git

ChangeLog, ntp_refclock.h, iosignal.c, ntp_refclock.c, ntpq_ops.c:
  * include/ntp_refclock.h (stropts.h, sys/clkdefs.h): Harmful and
  useless file include's turned off.
  * libntp/iosignal.c (netinet/in.h, sys/sockio.h): Duplicate file
  include's turned off.
  * ntpd/ntp_refclock.c (ntp_tty.h): File included.
  (refclock_open, refclock_ioctl): Use `TTY' from ntp_tty.h.
  * ntpd/refclock_atom.c: Grab a few headers regardless; if we don't
  CLOCK_ATOM we provide a stub pps_sample() routine wo the WHARTON
  can be compiled/used.
  * ntpq/ntpq_ops.c (dopeers, doopeers): Print the units for
  each column header.
  Tue Sep 12 16:25:51 2000  Philippe De Muyter  <phdm@macqel.be>

bk: 39cd10d2JSIUSfk8rIQdNIU02ZZ5Yg
---

diff --git a/ChangeLog b/ChangeLog
index 4e2f2b096d..460ac346e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2000-09-23  Harlan Stenn  <stenn@whimsy.udel.edu>
 
+	* include/ntp_refclock.h (stropts.h, sys/clkdefs.h): Harmful and
+	useless file include's turned off.
+	* libntp/iosignal.c (netinet/in.h, sys/sockio.h): Duplicate file
+	include's turned off.
+	* ntpd/ntp_refclock.c (ntp_tty.h): File included.
+	(refclock_open, refclock_ioctl): Use `TTY' from ntp_tty.h.
+	* ntpd/refclock_atom.c: Grab a few headers regardless; if we don't
+	CLOCK_ATOM we provide a stub pps_sample() routine wo the WHARTON
+	can be compiled/used.
+	* ntpq/ntpq_ops.c (dopeers, doopeers): Print the units for
+	each column header.
+	Tue Sep 12 16:25:51 2000  Philippe De Muyter  <phdm@macqel.be>
+
 	* ntpd/refclock_atom.c (atom_start): Lose "temp", because we now
 	initially either CAPTUREASSERT or CAPTURECLEAR.
 	(atom_pps): pps_info_t is our friend.  Update comments to reflect
diff --git a/include/ntp_refclock.h b/include/ntp_refclock.h
index c66b617eaf..f436c0619d 100644
--- a/include/ntp_refclock.h
+++ b/include/ntp_refclock.h
@@ -29,12 +29,14 @@
 #include <sys/modem.h>
 #endif
 
+#if 0 /* If you need that, include ntp_io.h instead */
 #if defined(STREAM)
 #include <stropts.h>
-#if defined(CLK)
+#if defined(CLK) /* This is never defined, except perhaps by a system header file */
 #include <sys/clkdefs.h>
 #endif /* CLK */
 #endif /* STREAM */
+#endif
 
 #include "recvbuff.h"
 
diff --git a/libntp/iosignal.c b/libntp/iosignal.c
index c8ec94961b..cb863d4320 100644
--- a/libntp/iosignal.c
+++ b/libntp/iosignal.c
@@ -16,15 +16,19 @@
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
 #endif
+#if 0 /* Included by ntp_fp.h */
 #ifdef HAVE_NETINET_IN_H
 # include <netinet/in.h>
 #endif
+#endif
 #ifdef HAVE_SYS_IOCTL_H
 # include <sys/ioctl.h>
 #endif
+#if 0 /* Included by ntp_if.h below */
 #ifdef HAVE_SYS_SOCKIO_H	/* UXPV: SIOC* #defines (Frank Vance <fvance@waii.com>) */
 # include <sys/sockio.h>
 #endif
+#endif
 #include <arpa/inet.h>
 
 #if _BSDI_VERSION >= 199510
diff --git a/ntpd/ntp_refclock.c b/ntpd/ntp_refclock.c
index a596a22cc6..129a1070ba 100644
--- a/ntpd/ntp_refclock.c
+++ b/ntpd/ntp_refclock.c
@@ -14,6 +14,7 @@
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_unixtime.h"
+#include "ntp_tty.h"
 #include "ntp_refclock.h"
 #include "ntp_stdlib.h"
 
@@ -32,6 +33,8 @@
 #include <sys/ppsclock.h>
 #endif /* HAVE_PPSCLOCK_H */
 
+/*#undef HAVE_PPSAPI	/* !!! !!! !!! !!! fix me */
+
 #ifdef HAVE_PPSAPI
 # ifdef HAVE_TIMEPPS_H
 #  include <timepps.h>
@@ -755,15 +758,7 @@ refclock_open(
 {
 	int fd, i;
 	int flags;
-#ifdef HAVE_TERMIOS
-	struct termios ttyb, *ttyp;
-#endif /* HAVE_TERMIOS */
-#ifdef HAVE_SYSV_TTYS
-	struct termio ttyb, *ttyp;
-#endif /* HAVE_SYSV_TTYS */
-#ifdef HAVE_BSD_TTYS
-	struct sgttyb ttyb, *ttyp;
-#endif /* HAVE_BSD_TTYS */
+	TTY ttyb, *ttyp;
 #ifdef TIOCMGET
 	u_long ltemp;
 #endif /* TIOCMGET */
@@ -967,15 +962,7 @@ refclock_ioctl(
 #if defined(HAVE_TERMIOS) || defined(HAVE_SYSV_TTYS) || defined(HAVE_BSD_TTYS)
 
 #ifdef TTYCLK
-#ifdef HAVE_TERMIOS
-	struct termios ttyb, *ttyp;
-#endif /* HAVE_TERMIOS */
-#ifdef HAVE_SYSV_TTYS
-	struct termio ttyb, *ttyp;
-#endif /* HAVE_SYSV_TTYS */
-#ifdef HAVE_BSD_TTYS
-	struct sgttyb ttyb, *ttyp;
-#endif /* HAVE_BSD_TTYS */
+	TTY ttyb, *ttyp;
 #endif /* TTYCLK */
 
 #ifdef DEBUG
diff --git a/ntpq/ntpq_ops.c b/ntpq/ntpq_ops.c
index 8a8a961d80..6f5b5ec1c3 100644
--- a/ntpq/ntpq_ops.c
+++ b/ntpq/ntpq_ops.c
@@ -1546,6 +1546,8 @@ dopeers(
 	}
 	(void) fprintf(fp,
 			   "     remote           refid      st t when poll reach   delay   offset  jitter\n");
+	(void) fprintf(fp,
+			   "                                      (s)  (s)          (ms)     (ms)    (ms) \n");
 	if (numhosts > 1)
 		for (i = 0; i <= maxhostlen; ++i)
 		(void) fprintf(fp, "=");
@@ -1609,6 +1611,8 @@ doopeers(
 
 	(void) fprintf(fp,
 			   "     remote           local      st t when poll reach   delay   offset    disp\n");
+	(void) fprintf(fp,
+			   "                                      (s)  (s)          (ms)     (ms)     (ms)\n");
 	(void) fprintf(fp,
 			   "==============================================================================\n");