[Bug 1872] Remove legacy ppsclock fdpps, #ifdef PPS

bk: 501a3bbe1duNDRHNdIG2bkzDLrjD5g

diff --git a/ChangeLog b/ChangeLog
index 2219606f82c391df96669ac7253457d77e2c1523..05bf6e6b23b52c9580e6eb4ad8e99788bfb36cad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 1872] Remove legacy ppsclock fdpps, #ifdef PPS.
 * [Bug 2075] Fix spelling of 'incompatible'.
 * Clean up an exit status in ntpq.c.
 (4.2.7p291) 2012/07/31 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/ntpd/ntp_refclock.c b/ntpd/ntp_refclock.c
index 65097150ad3ef5c5abe329423991418bedb9e862..0e2d5c7ae98c4832fe7873731a57b53b264d6d6d 100644 (file)
--- a/ntpd/ntp_refclock.c
+++ b/ntpd/ntp_refclock.c
@@ -61,9 +61,6 @@
 #define FUDGEFAC       .1      /* fudge correction factor */
 #define LF             0x0a    /* ASCII LF */
 
-#ifdef PPS     /* fdpps still ref'd by refclock_zyfer.c */
-int    fdpps;                  /* ppsclock legacy */
-#endif /* PPS */
 int    cal_enable;             /* enable refclock calibrate */
 
 /*
@@ -805,9 +802,7 @@ refclock_setup(
 {
        int     i;
        TTY     ttyb, *ttyp;
-#ifdef PPS             /* fdpps referenced by refclock_zyfer.c */
-       fdpps = fd;             /* ppsclock legacy */
-#endif /* PPS */
+
        /*
         * By default, the serial line port is initialized in canonical
         * (line-oriented) mode at specified line speed, 8 bits and no

diff --git a/ntpd/refclock_zyfer.c b/ntpd/refclock_zyfer.c
index 1a704e12ab89ca66b6505c4c071b237979ccdf97..7b79da32c97e9f1c9c9fea0f70e31c21a6413fde 100644 (file)
--- a/ntpd/refclock_zyfer.c
+++ b/ntpd/refclock_zyfer.c
@@ -210,16 +210,6 @@ zyfer_receive(
        int tfom;               /* Time Figure Of Merit */
        int omode;              /* Operation mode */
        u_char *p;
-#ifdef PPS
-       struct ppsclockev ppsev;
-       int request;
-#ifdef HAVE_CIOGETEV
-        request = CIOGETEV;
-#endif
-#ifdef HAVE_TIOCGPPSEV
-        request = TIOCGPPSEV;
-#endif
-#endif /* PPS */
 
        peer = rbufp->recv_peer;
        pp = peer->procptr;
@@ -292,14 +282,7 @@ zyfer_receive(
                pp->leap = LEAP_NOTINSYNC;
                return;
        }
-#ifdef PPS
-       if(ioctl(fdpps,request,(caddr_t) &ppsev) >=0) {
-               ppsev.tv.tv_sec += (u_int32) JAN_1970;
-               TVTOTS(&ppsev.tv,&up->tstamp);
-       }
-       /* record the last ppsclock event time stamp */
-       pp->lastrec = up->tstamp;
-#endif /* PPS */
+
        if (!refclock_process(pp)) {
                refclock_report(peer, CEVNT_BADTIME);
                return;