ChangeLog, refclock_irig.c, ntptime.c:

  * ntpd/refclock_irig.c (irig_debug): NetBSD patches
  From: Frederick Bruckman <fb@enteract.com>
  * util/ntptime.c (main): ntx.freq bugfix (-f option)
  From: Frederick Bruckman <fb@enteract.com>

bk: 377078fauHOptXTC3Psm7xNQBPykGA

diff --git a/ChangeLog b/ChangeLog
index 06c89bbd674b54996bb0a4c45a445aaf63138d94..55eb12a29db287802f1ae2eeaf7a0bbc945ea1de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1999-06-23  Harlan Stenn  <stenn@whimsy.udel.edu>
+
+       * ntpd/refclock_irig.c (irig_debug): NetBSD patches
+       From: Frederick Bruckman <fb@enteract.com>
+
+       * util/ntptime.c (main): ntx.freq bugfix (-f option)
+       From: Frederick Bruckman <fb@enteract.com>
+
 1999-06-22  Harlan Stenn  <stenn@whimsy.udel.edu>
 
        * configure.in: Fix typo with DECL_H_ERRNO test

diff --git a/ntpd/refclock_irig.c b/ntpd/refclock_irig.c
index 21403cbc5e8eab07f9cbd3f2033559cd545563ed..d8b92e8fd9b4fa167ea26a83f31e6140749dcdfa 100644 (file)
--- a/ntpd/refclock_irig.c
+++ b/ntpd/refclock_irig.c
@@ -17,6 +17,9 @@
 #ifdef HAVE_SUN_AUDIOIO_H
 #include <sun/audioio.h>
 #endif /* HAVE_SUN_AUDIOIO_H */
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif /* HAVE_SYS_IOCTL_H */
 
 #include "ntpd.h"
 #include "ntp_io.h"
@@ -1067,8 +1070,13 @@ irig_debug(
                info.record.samples, info.record.eof,
                info.record.pause, info.record.error,
                info.record.waiting, info.record.balance);
+#ifdef __NetBSD__
+       printf("irig: monitor %d, blocksize %d, hiwat %d, lowat %d, mode %d\n",
+              info.monitor_gain, info.blocksize, info.hiwat, info.lowat, info.mode);
+#else /* __NetBSD__ */
        printf("irig: monitor %d, muted %d\n",
               info.monitor_gain, info.output_muted);
+#endif /* __NetBSD__ */
 }
 #endif /* DEBUG */
 

diff --git a/util/ntptime.c b/util/ntptime.c
index cf7baec64ac292d0d5b170215350e9d105dc2c53..aa964955d293671ac1bd700d93f3f40bd1c8bece 100644 (file)
--- a/util/ntptime.c
+++ b/util/ntptime.c
@@ -104,7 +104,7 @@ main(
                break;
            case 'f':
                ntx.modes |= MOD_FREQUENCY;
-               ntx.freq = (int)(atof(ntp_optarg) / SCALE_FREQ);
+               ntx.freq = (long)(atof(ntp_optarg) * SCALE_FREQ);
                break;
            case 'm':
                ntx.modes |= MOD_MAXERROR;