From: Harlan Stenn Date: Wed, 24 Jul 2013 09:46:25 +0000 (-0400) Subject: [Bug 2322] Oncore driver should send 0 PPS offset to GPS X-Git-Tag: NTP_4_2_7P376~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6eba06f02ee3f37b262b99978012da10f9a83239;p=thirdparty%2Fntp.git [Bug 2322] Oncore driver should send 0 PPS offset to GPS bk: 51efa271dnqRF6sKbEaFB4EatCL-jg --- diff --git a/ChangeLog b/ChangeLog index aec1f3efb..47b811c5b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +* [Bug 2322] Oncore driver should send 0 PPS offset to GPS. (4.2.7p375) 2013/07/22 Released by Harlan Stenn * [Bug 883] log warning arguments swapped in refclock_gpsvme.c. * [Bug 2368] Correct bug in previous attempt. diff --git a/ntpd/refclock_oncore.c b/ntpd/refclock_oncore.c index 8e63c0354..91839c7d1 100644 --- a/ntpd/refclock_oncore.c +++ b/ntpd/refclock_oncore.c @@ -3050,11 +3050,9 @@ oncore_msg_Cj_init( oncore_sendmsg(instance, Cmd, sizeof(oncore_cmd_Az)); /* 6,8,12 */ /* PPS offset in ns */ - if (instance->offset) { - memcpy(Cmd, oncore_cmd_Ay, (size_t) sizeof(oncore_cmd_Ay)); /* some have it, some don't */ - w32_buf(&Cmd[-2+4], instance->offset); /* will check for hw response */ - oncore_sendmsg(instance, Cmd, sizeof(oncore_cmd_Ay)); - } + memcpy(Cmd, oncore_cmd_Ay, (size_t) sizeof(oncore_cmd_Ay)); /* some have it, some don't */ + w32_buf(&Cmd[-2+4], instance->offset); /* will check for hw response */ + oncore_sendmsg(instance, Cmd, sizeof(oncore_cmd_Ay)); /* Satellite mask angle */