[ntp:bk-ntp-dev-send] BitKeeper diffs

stenn at whimsy.udel.edu stenn at whimsy.udel.edu
Fri Nov 21 11:09:59 UTC 2014


#### ChangeSet ####
2014-11-21 11:08:32+00:00, stenn at psp-fb1.ntp.org
  Rename pps_enable to hardpps_enable.

==== ChangeLog ====
2014-11-21 11:06:34+00:00, stenn at psp-fb1.ntp.org +1 -0
  Rename pps_enable to hardpps_enable.

--- 1.1569/ChangeLog	2014-11-21 04:43:53 -05:00
+++ 1.1570/ChangeLog	2014-11-21 06:06:34 -05:00
@@ -1,4 +1,5 @@
 * [Bug 2314] Only enable PPS if kernel consumer binding succeeds.
+* Rename pps_enable to hardpps_enable.
 (4.2.7p480) 2014/11/21 Released by Harlan Stenn <stenn at ntp.org>
 * [Bug 2677] PATH_MAX isn't #define'd  under Windows.
   Regression from the patch fixing Bug 2639.

==== include/ntpd.h ====
2014-11-21 11:06:38+00:00, stenn at psp-fb1.ntp.org +1 -1
  Rename pps_enable to hardpps_enable.

--- 1.182/include/ntpd.h	2014-04-22 15:40:54 -04:00
+++ 1.183/include/ntpd.h	2014-11-21 06:06:38 -05:00
@@ -400,7 +400,7 @@ extern int	pll_status;		/* status bits f
 extern int	ntp_enable;		/* clock discipline enabled */
 extern int	pll_control;		/* kernel support available */
 extern int	kern_enable;		/* kernel support enabled */
-extern int	pps_enable;		/* kernel PPS discipline enabled */
+extern int	hardpps_enable;		/* kernel PPS discipline enabled */
 extern int	ext_enable;		/* external clock enabled */
 extern int	cal_enable;		/* refclock calibrate enable */
 extern int	allow_panic;		/* allow panic correction */

==== ntpd/ntp_loopfilter.c ====
2014-11-21 11:06:57+00:00, stenn at psp-fb1.ntp.org +3 -3
  Rename pps_enable to hardpps_enable.

--- 1.174/ntpd/ntp_loopfilter.c	2014-11-20 05:21:35 -05:00
+++ 1.175/ntpd/ntp_loopfilter.c	2014-11-21 06:06:57 -05:00
@@ -146,7 +146,7 @@ static	void	stop_kern_loop(void);
 int	ntp_enable = TRUE;	/* clock discipline enabled */
 int	pll_control;		/* kernel support available */
 int	kern_enable = TRUE;	/* kernel support enabled */
-int	pps_enable;		/* kernel PPS discipline enabled */
+int	hardpps_enable;		/* kernel PPS discipline enabled */
 int	ext_enable;		/* external clock enabled */
 int	pps_stratum;		/* pps stratum */
 int	allow_panic = FALSE;	/* allow panic correction */
@@ -662,7 +662,7 @@ local_clock(
 			/*
 			 * Enable/disable the PPS if requested.
 			 */
-			if (pps_enable) {
+			if (hardpps_enable) {
 				if (!(pll_status & STA_PPSTIME))
 					report_event(EVNT_KERN,
 					    NULL, "PPS enabled");
@@ -686,7 +686,7 @@ local_clock(
 		 * frequency and jitter.
 		 */
 		if ((ntp_adj_ret = ntp_adjtime(&ntv)) != 0) {
-		    ntp_adjtime_error_handler(__func__, &ntv, ntp_adj_ret, errno, pps_enable, 0, __LINE__ - 1);
+		    ntp_adjtime_error_handler(__func__, &ntv, ntp_adj_ret, errno, hardpps_enable, 0, __LINE__ - 1);
 		}
 		pll_status = ntv.status;
 #ifdef STA_NANO

==== ntpd/ntp_proto.c ====
2014-11-21 11:06:57+00:00, stenn at psp-fb1.ntp.org +2 -2
  Rename pps_enable to hardpps_enable.

--- 1.349/ntpd/ntp_proto.c	2014-08-09 16:11:42 -04:00
+++ 1.350/ntpd/ntp_proto.c	2014-11-21 06:06:57 -05:00
@@ -3999,7 +3999,7 @@ init_proto(void)
 		sys_ttl[i] = (u_char)((i * 256) / MAX_TTL);
 		sys_ttlmax = i;
 	}
-	pps_enable = 0;
+	hardpps_enable = 0;
 	stats_control = 1;
 }
 
@@ -4064,7 +4064,7 @@ proto_config(
 		break;
 
 	case PROTO_PPS:		/* PPS discipline (pps) */
-		pps_enable = value;
+		hardpps_enable = value;
 		break;
 
 	case PROTO_FILEGEN:	/* statistics (stats) */

==== ntpd/ntp_refclock.c ====
2014-11-21 11:06:58+00:00, stenn at psp-fb1.ntp.org +1 -1
  Rename pps_enable to hardpps_enable.

--- 1.117/ntpd/ntp_refclock.c	2014-11-21 04:43:57 -05:00
+++ 1.118/ntpd/ntp_refclock.c	2014-11-21 06:06:58 -05:00
@@ -1257,7 +1257,7 @@ refclock_params(
 				return (0);
 			}
 		} else {
-			pps_enable = 1;
+			hardpps_enable = 1;
 		}
 	}
 	return (1);

==== ntpd/ntp_request.c ====
2014-11-21 11:06:58+00:00, stenn at psp-fb1.ntp.org +1 -1
  Rename pps_enable to hardpps_enable.

--- 1.111/ntpd/ntp_request.c	2013-07-17 05:23:22 -04:00
+++ 1.112/ntpd/ntp_request.c	2014-11-21 06:06:58 -05:00
@@ -1130,7 +1130,7 @@ sys_info(
 		is->flags |= INFO_FLAG_MONITOR;
 	if (ntp_enable)
 		is->flags |= INFO_FLAG_NTP;
-	if (pps_enable)
+	if (hardpps_enable)
 		is->flags |= INFO_FLAG_PPS_SYNC;
 	if (stats_control)
 		is->flags |= INFO_FLAG_FILEGEN;

==== ntpd/refclock_jupiter.c ====
2014-11-21 11:06:59+00:00, stenn at psp-fb1.ntp.org +1 -1
  Rename pps_enable to hardpps_enable.

--- 1.27/ntpd/refclock_jupiter.c	2011-02-20 15:22:39 -05:00
+++ 1.28/ntpd/refclock_jupiter.c	2014-11-21 06:06:59 -05:00
@@ -361,7 +361,7 @@ jupiter_ppsapi(
 			    "refclock_jupiter: time_pps_kcbind failed: %m");
 			return (0);
 		}
-		pps_enable = 1;
+		hardpps_enable = 1;
 	}
 /*	instance->peer->precision = PPS_PRECISION; */
 

==== ntpd/refclock_oncore.c ====
2014-11-21 11:07:00+00:00, stenn at psp-fb1.ntp.org +1 -1
  Rename pps_enable to hardpps_enable.

--- 1.100/ntpd/refclock_oncore.c	2014-07-16 00:17:31 -04:00
+++ 1.101/ntpd/refclock_oncore.c	2014-11-21 06:07:00 -05:00
@@ -919,7 +919,7 @@ oncore_ppsapi(
 			return (0);
 		}
 
-		pps_enable = 1;
+		hardpps_enable = 1;
 	}
 	return(1);
 }

==== ntpd/refclock_parse.c ====
2014-11-21 11:07:00+00:00, stenn at psp-fb1.ntp.org +2 -2
  Rename pps_enable to hardpps_enable.

--- 1.67/ntpd/refclock_parse.c	2012-07-19 19:26:12 -04:00
+++ 1.68/ntpd/refclock_parse.c	2014-11-21 06:07:00 -05:00
@@ -2837,7 +2837,7 @@ parse_hardpps(
 			 * tell the rest, that we have a kernel PPS source, iff we ever enable HARDPPS
 			 */
 			if (mode == PARSE_HARDPPS_ENABLE)
-			        pps_enable = 1;
+			        hardpps_enable = 1;
 		}
 	}
 
@@ -6017,7 +6017,7 @@ NONEMPTY_TRANSLATION_UNIT
  * implement fast refclock startup
  *
  * Revision 4.50  2005/04/16 20:51:35  kardel
- * set pps_enable = 1 when binding a kernel PPS source
+ * set hardpps_enable = 1 when binding a kernel PPS source
  *
  * Revision 4.49  2005/04/16 17:29:26  kardel
  * add non polling clock type 18 for just listenning to Meinberg clocks

#### ChangeSet ####
2014-11-21 09:44:10+00:00, stenn at psp-fb1.ntp.org
  [Bug 2314] Only enable PPS if kernel consumer binding succeeds

==== ChangeLog ====
2014-11-21 09:43:53+00:00, stenn at psp-fb1.ntp.org +1 -0
  [Bug 2314] Only enable PPS if kernel consumer binding succeeds

--- 1.1568/ChangeLog	2014-11-21 04:00:01 -05:00
+++ 1.1569/ChangeLog	2014-11-21 04:43:53 -05:00
@@ -1,3 +1,4 @@
+* [Bug 2314] Only enable PPS if kernel consumer binding succeeds.
 (4.2.7p480) 2014/11/21 Released by Harlan Stenn <stenn at ntp.org>
 * [Bug 2677] PATH_MAX isn't #define'd  under Windows.
   Regression from the patch fixing Bug 2639.

==== ntpd/ntp_refclock.c ====
2014-11-21 09:43:57+00:00, stenn at psp-fb1.ntp.org +4 -3
  [Bug 2314] Only enable PPS if kernel consumer binding succeeds

--- 1.116/ntpd/ntp_refclock.c	2012-08-02 04:35:00 -04:00
+++ 1.117/ntpd/ntp_refclock.c	2014-11-21 04:43:57 -05:00
@@ -578,7 +578,7 @@ refclock_gtlin(
 	)
 {
 	const char *sp, *spend;
-	char       *dp, *dpend;
+	char	   *dp, *dpend;
 	int         dlen;
 
 	if (bmax <= 0)
@@ -838,7 +838,7 @@ refclock_setup(
 		ttyp->c_cflag = CS8 | CLOCAL | CREAD;
 		if (lflags & LDISC_7O1) {
 			/* HP Z3801A needs 7-bit, odd parity */
-  			ttyp->c_cflag = CS7 | PARENB | PARODD | CLOCAL | CREAD;
+			ttyp->c_cflag = CS7 | PARENB | PARODD | CLOCAL | CREAD;
 		}
 		cfsetispeed(&ttyb, speed);
 		cfsetospeed(&ttyb, speed);
@@ -1256,8 +1256,9 @@ refclock_params(
 				    "refclock_params: time_pps_kcbind: %m");
 				return (0);
 			}
+		} else {
+			pps_enable = 1;
 		}
-		pps_enable = 1;
 	}
 	return (1);
 }


More information about the bk-ntp-dev-send mailing list