ChangeLog:

  Added comments for fixing the incorrect edge parameter passed to time_pps_kcbind.
refclock_nmea.c:
  Fixed the incorrect edge parameter being passed to time_pps_kcbind.

bk: 4832cc51I8yDvzmzKUz0jZU4sFvNPw

diff --git a/ChangeLog b/ChangeLog
index 31fb52211c62ac2e942ccb8fbf84f5b2c449ad2e..17303b0b6e508a42bba0b91c65b1b45063f66470 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Fixed the incorrect edge parameter being passed to time_pps_kcbind.
 * [Bug 399] NMEA refclock driver does not honor time1 offset if flag3 set.
 * [Bug 985] Modifications to NMEA reference clock driver to support Accord GPS Clock.
 * [Bug 1022] Fix compilation problems with yesterday's commit.

diff --git a/ntpd/refclock_nmea.c b/ntpd/refclock_nmea.c
index 08ed9adc9294a1a7524cccf7440c3cc5f45f9490..340d009f71c10c55d201fbc20d5e2608f18c2080 100644 (file)
--- a/ntpd/refclock_nmea.c
+++ b/ntpd/refclock_nmea.c
@@ -380,7 +380,7 @@ nmea_ppsapi(
        }
        if (enb_hardpps) {
                if (time_pps_kcbind(up->handle, PPS_KC_HARDPPS,
-                                   up->pps_params.mode & ~PPS_TSFMT_TSPEC,
+                                   up->pps_params.mode & 0x0F,
                                    PPS_TSFMT_TSPEC) < 0) {
                        msyslog(LOG_ERR,
                            "refclock_nmea: time_pps_kcbind failed: %m");