From: Frank Kardel <kardel@ntp.org>
Date: Thu, 22 Jun 2006 19:28:28 +0000 (+0000)
Subject: refclock_parse.c:
X-Git-Tag: NTP_4_2_3P9~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4324afc199242d38df83915f4550d138a3e9ab2;p=thirdparty%2Fntp.git

refclock_parse.c:
  bug 632: update kernel PPS offsets when PPS offset is re-configured

bk: 449aef5cvf9LoNC38IvemgHF6JBXBA
---

diff --git a/ntpd/refclock_parse.c b/ntpd/refclock_parse.c
index 1ba6685e7..0ea4d652e 100644
--- a/ntpd/refclock_parse.c
+++ b/ntpd/refclock_parse.c
@@ -2720,14 +2720,14 @@ parse_ppsapi(
 	} else {
 	        if (mode1 == PPS_OFFSETCLEAR) 
 		        {
-			        parse->ppsparams.clear_offset.tv_sec = parse->ppsphaseadjust;
-			        parse->ppsparams.clear_offset.tv_nsec = 1e9*(parse->ppsphaseadjust - (long)parse->ppsphaseadjust);
+			        parse->ppsparams.clear_offset.tv_sec = -parse->ppsphaseadjust;
+			        parse->ppsparams.clear_offset.tv_nsec = -1e9*(parse->ppsphaseadjust - (long)parse->ppsphaseadjust);
 			}
 	  
 		if (mode1 == PPS_OFFSETASSERT)
 	                {
-		                parse->ppsparams.assert_offset.tv_sec = parse->ppsphaseadjust;
-				parse->ppsparams.assert_offset.tv_nsec = 1e9*(parse->ppsphaseadjust - (long)parse->ppsphaseadjust);
+		                parse->ppsparams.assert_offset.tv_sec = -parse->ppsphaseadjust;
+				parse->ppsparams.assert_offset.tv_nsec = -1e9*(parse->ppsphaseadjust - (long)parse->ppsphaseadjust);
 			}
 	}
 	
@@ -3177,6 +3177,12 @@ parse_ctl(
 		      msyslog(LOG_INFO, "PARSE receiver #%d: new PPS phase adjustment %.6f s",
 			  CLK_UNIT(parse->peer),
 			      parse->ppsphaseadjust);
+#if defined(HAVE_PPSAPI)
+		      if (CLK_PPS(parse->peer))
+		      {
+			      parse_ppsapi(parse);
+		      }
+#endif
 		    }
 		}
 	}