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 4e2f2b096db6157d64612416d97c02cd72b5b93f..460ac346e37cc51395d51ceb7e501f7d9abeb8f4 100644 (file)
--- 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 c66b617eaf36b1d6572a6f7def18aec06e8d35b0..f436c0619dc65f4d19be3330351211a5fc1b9165 100644 (file)
--- 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 c8ec94961be853399a892f4a011820c09889df9f..cb863d4320c5356cd0077453776bbe87b3f4ff95 100644 (file)
--- 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 a596a22cc6470d7bd39a59215642c265c355cf38..129a1070ba012ec67735c039f10d0afea4903209 100644 (file)
--- 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 8a8a961d809725d94c9f103db15fc36a6468ff36..6f5b5ec1c3c87d2a3d200f5adfe7c4c862701d4a 100644 (file)
--- 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");