Rename pps_enable to hardpps_enable.

bk: 546f1d30vxAd3_HQRwHqZjuvxDX6PQ

diff --git a/ChangeLog b/ChangeLog
index 991a4e87f914db2be1bab3c9f5f70139d90b5007..31011405f7b793802f06edd6759b1cdda4223c24 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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@ntp.org>
 * [Bug 2677] PATH_MAX isn't #define'd  under Windows.
   Regression from the patch fixing Bug 2639.

diff --git a/include/ntpd.h b/include/ntpd.h
index 0a8a93186c5aac86507627de8bcfde984a4e1969..51d8f2accd3e6113aecda71c43cb9655b47e33fb 100644 (file)
--- a/include/ntpd.h
+++ b/include/ntpd.h
@@ -400,7 +400,7 @@ extern int  pll_status;             /* status bits for kernel pll */
 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 */

diff --git a/ntpd/ntp_loopfilter.c b/ntpd/ntp_loopfilter.c
index 00260fea04d32df843d6993a69211f413fc97358..87db726e417e8257c4829401c473a1056b396c03 100644 (file)
--- a/ntpd/ntp_loopfilter.c
+++ b/ntpd/ntp_loopfilter.c
@@ -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

diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index 81c976b7fedf3e23987d911ea35daf402c7e0f32..2f7543f74b6206eedcfba784b7525d0172b8abd1 100644 (file)
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -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) */

diff --git a/ntpd/ntp_refclock.c b/ntpd/ntp_refclock.c
index dd753b3c739e93f1692f282261df697903bf70f3..4fe7cdb1bdc414bb3a36a4d3cb61d6c0620ceb23 100644 (file)
--- a/ntpd/ntp_refclock.c
+++ b/ntpd/ntp_refclock.c
@@ -1257,7 +1257,7 @@ refclock_params(
                                return (0);
                        }
                } else {
-                       pps_enable = 1;
+                       hardpps_enable = 1;
                }
        }
        return (1);

diff --git a/ntpd/ntp_request.c b/ntpd/ntp_request.c
index e11adc40220e6e2f4a9a7bab60dcc1e06cbe6808..157304b6da5206ce48c63deca0ebc9f5b6f32aa2 100644 (file)
--- a/ntpd/ntp_request.c
+++ b/ntpd/ntp_request.c
@@ -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;

diff --git a/ntpd/refclock_jupiter.c b/ntpd/refclock_jupiter.c
index ee3a7629bd11bc55f4f0df0782a27e1ddf8bddbb..377fc563229afbbb9828ab0884a2f624ae2d00f0 100644 (file)
--- a/ntpd/refclock_jupiter.c
+++ b/ntpd/refclock_jupiter.c
@@ -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; */
 

diff --git a/ntpd/refclock_oncore.c b/ntpd/refclock_oncore.c
index d05d9e4a0be8699f85c551a1fedbbe09e8539ec8..3bc60bf50321c8b194269bcb7c81306cd7c784f4 100644 (file)
--- a/ntpd/refclock_oncore.c
+++ b/ntpd/refclock_oncore.c
@@ -919,7 +919,7 @@ oncore_ppsapi(
                        return (0);
                }
 
-               pps_enable = 1;
+               hardpps_enable = 1;
        }
        return(1);
 }

diff --git a/ntpd/refclock_parse.c b/ntpd/refclock_parse.c
index c5134039f915260cc9dd26d5a9c371cf208b0a07..052ec3a5ed9953365bba20f8b08b9e9b04ed40bd 100644 (file)
--- a/ntpd/refclock_parse.c
+++ b/ntpd/refclock_parse.c
@@ -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