ChangeLog, configure, configure.in:

  * configure.in: ONCORE is OK if ac_cv_hdr_def_tiocdcdtimestamp=yes
in_system.h:
  Added dummy in_system.h  "All systems have it :)"
ip.h:
  These little files save a bunch of ifdef WINNT's and stay hidden in the
  ports subdirectory.
ChangeLog, refclock_oncore.c:
  * ntpd/refclock_oncore.c (oncore_start): Only dance with the
  pps_device if it's there.
  From: reg@dwf.com

bk: 387edd9eRrcxl8QA8-CQ3XBhYErJ7g

diff --git a/ChangeLog b/ChangeLog
index 801e42804f520856fff1952ef3126d8add771052..812d6d9896bf23085478965f862f7a31afb0b477 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2000-01-14  Harlan Stenn  <stenn@whimsy.udel.edu>
 
+       * ntpd/refclock_oncore.c (oncore_start): Only dance with the
+       pps_device if it's there.
+       From: reg@dwf.com
+
+       * configure.in: ONCORE is OK if ac_cv_hdr_def_tiocdcdtimestamp=yes
+
        * build: Just overwrite the log file each time; sometimes NFS goes
        a little goofy.
 

diff --git a/configure b/configure
index 4300b6466bb4592a1affeee7554122eb31b59c79..7394acacb64f3560d13dd414dcee6610a372491b 100755 (executable)
--- a/configure
+++ b/configure
@@ -7924,7 +7924,7 @@ echo "$ac_t""$ntp_ok" 1>&6
 # there is NO way that I can tell to tell if a given OS is using timespec or
 # timeval so just set it here for the one case that is KNOWN to use timespec.
 
-case "$ac_cv_header_timepps_h$ac_cv_header_sys_timepps_h" in
+case "$ac_cv_header_timepps_h$ac_cv_header_sys_timepps_h$ac_cv_hdr_def_tiocdcdtimestamp" in
  *yes*)
     cat >> confdefs.h <<\EOF
 #define HAVE_PPSAPI 1

diff --git a/configure.in b/configure.in
index 62699fce8eaf0c99c9cab90bad0c0c6d791866d2..6a7eb721406dfc20c34e521979254b39fb1da2d9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1410,7 +1410,7 @@ AC_MSG_RESULT($ntp_ok)
 # there is NO way that I can tell to tell if a given OS is using timespec or
 # timeval so just set it here for the one case that is KNOWN to use timespec.
 
-case "$ac_cv_header_timepps_h$ac_cv_header_sys_timepps_h" in
+case "$ac_cv_header_timepps_h$ac_cv_header_sys_timepps_h$ac_cv_hdr_def_tiocdcdtimestamp" in
  *yes*)
     AC_DEFINE(HAVE_PPSAPI)
     ac_cv_var_oncore_ok=yes

diff --git a/ntpd/refclock_oncore.c b/ntpd/refclock_oncore.c
index 6ecf62a3c253ec4728519406ceb112cff3f9c601..e0ba177cc1a43502662aa1b1ef092fc63978fc88 100644 (file)
--- a/ntpd/refclock_oncore.c
+++ b/ntpd/refclock_oncore.c
@@ -512,27 +512,29 @@ oncore_start(
                exit(1);
        }
 
-       if (stat(pps_device, &stat1)) {
-               perror("ONCORE: stat pps_device");
-               return(0);
-       }
-
-       /* must have hardpps ON, and fd2 must be the same device as on the pps line */
-
-       if (pps_hardpps && ((stat1.st_dev == stat2.st_dev) && (stat1.st_ino == stat2.st_ino))) {
-               int     i;
-
-               if (instance->assert)
-                       i = PPS_CAPTUREASSERT;
-               else
-                       i = PPS_CAPTURECLEAR;
-
-               if (i&mode) {
-                       if (time_pps_kcbind(instance->pps_h, PPS_KC_HARDPPS, i,
-                           PPS_TSFMT_TSPEC) < 0) {
-                               msyslog(LOG_ERR,
-                                   "refclock_ioctl: time_pps_kcbind failed: %m");
-                               return (0);
+       if (pps_device) {
+               if (stat(pps_device, &stat1)) {
+                       perror("ONCORE: stat pps_device");
+                       return(0);
+               }
+       
+               /* must have hardpps ON, and fd2 must be the same device as on the pps line */
+       
+               if (pps_hardpps && ((stat1.st_dev == stat2.st_dev) && (stat1.st_ino == stat2.st_ino))) {
+                       int     i;
+       
+                       if (instance->assert)
+                               i = PPS_CAPTUREASSERT;
+                       else
+                               i = PPS_CAPTURECLEAR;
+       
+                       if (i&mode) {
+                               if (time_pps_kcbind(instance->pps_h, PPS_KC_HARDPPS, i,
+                                   PPS_TSFMT_TSPEC) < 0) {
+                                       msyslog(LOG_ERR,
+                                           "refclock_ioctl: time_pps_kcbind failed: %m");
+                                       return (0);
+                               }
                        }
                }
        }

diff --git a/ports/winnt/include/netinet/in_system.h b/ports/winnt/include/netinet/in_system.h
new file mode 100644 (file)
index 0000000..5e15997
--- /dev/null
+++ b/ports/winnt/include/netinet/in_system.h
@@ -0,0 +1,4 @@
+/**************************************************************
+ * Dummy Header for Unix to Windows NT portability
+ * Created for NTP package
+ **************************************************************/

diff --git a/ports/winnt/include/netinet/ip.h b/ports/winnt/include/netinet/ip.h
new file mode 100644 (file)
index 0000000..5e15997
--- /dev/null
+++ b/ports/winnt/include/netinet/ip.h
@@ -0,0 +1,4 @@
+/**************************************************************
+ * Dummy Header for Unix to Windows NT portability
+ * Created for NTP package
+ **************************************************************/