[Git][NTPsec/ntpsec][master] Remove fossil remnants of the long-deprecated ppsclock line discipline.
Eric S. Raymond
gitlab at mg.gitlab.com
Mon Nov 23 23:41:44 UTC 2015
Eric S. Raymond pushed to branch master at NTPsec / ntpsec
Commits:
e9392efa by Eric S. Raymond at 2015-11-23T18:41:26Z
Remove fossil remnants of the long-deprecated ppsclock line discipline.
No logic changes.
- - - - -
8 changed files:
- include/parse.h
- ntpd/refclock_arc.c
- ntpd/refclock_as2201.c
- ntpd/refclock_jupiter.c
- ntpd/refclock_mx4200.c
- ntpd/refclock_parse.c
- ntpd/refclock_zyfer.c
- pylib/configure.py
Changes:
=====================================
include/parse.h
=====================================
--- a/include/parse.h
+++ b/include/parse.h
@@ -112,7 +112,7 @@
#define PARSE_LEAP_DELETE CLK_FLAG4 /* use flag4 to force leap deletion - only necessary when earth slows down */
#define PARSE_FIXED_FMT 0x10 /* fixed format */
-#define PARSE_PPSCLOCK 0x20 /* try to get PPS time stamp via ppsclock ioctl */
+#define PARSE_PPSAPI 0x20 /* try to get PPS time stamp via API */
/*
* size of buffers
=====================================
ntpd/refclock_arc.c
=====================================
--- a/ntpd/refclock_arc.c
+++ b/ntpd/refclock_arc.c
@@ -258,8 +258,6 @@ TO-DO LIST
for long-term errors in the clock value (time2 defaults to 0 so the
correction would be disabled by default).
- * Consider trying to use the tty_clk/ppsclock support.
-
* Possibly use average or maximum signal quality reported during
resync, rather than just the last one, which may be atypical.
=====================================
ntpd/refclock_as2201.c
=====================================
--- a/ntpd/refclock_as2201.c
+++ b/ntpd/refclock_as2201.c
@@ -37,23 +37,12 @@
* and "df" commands does not matter. The radio should select UTC
* timescale using the "ts utc" command.
*
- * There are two modes of operation for this driver. The first with
- * default configuration is used with stock kernels and serial-line
+ * This driver can be used with stock kernels and serial-line
* drivers and works with almost any machine. In this mode the driver
* assumes the radio captures a timestamp upon receipt of the "*" that
* begins the driver query. Accuracies in this mode are in the order of
* a millisecond or two and the receiver can be connected to only one
* host.
- *
- * The second mode of operation can be used for SunOS kernels that have
- * been modified with the ppsclock streams module included in this
- * distribution. The mode is enabled if flag3 of the fudge configuration
- * command has been set to 1. In this mode a precise timestamp is
- * available using a gadget box and 1-pps signal from the receiver. This
- * improves the accuracy to the order of a few tens of microseconds. In
- * addition, the serial output and 1-pps signal can be bussed to more
- * than one hosts, but only one of them should be connected to the
- * radio input data line.
*/
/*
=====================================
ntpd/refclock_jupiter.c
=====================================
--- a/ntpd/refclock_jupiter.c
+++ b/ntpd/refclock_jupiter.c
@@ -33,11 +33,10 @@
/*
* This driver supports the Rockwell Jupiter GPS Receiver board
- * adapted to precision timing applications. It requires the
- * ppsclock line discipline or streams module described in the
- * Line Disciplines and Streams Drivers page. It also requires a
- * gadget box and 1-PPS level converter, such as described in the
- * Pulse-per-second (PPS) Signal Interfacing page.
+ * adapted to precision timing applications. It requires the PPS API
+ * support. It also requires a gadget box and 1-PPS level converter,
+ * such as described in the Pulse-per-second (PPS) Signal Interfacing
+ * page.
*
* It may work (with minor modifications) with other Rockwell GPS
* receivers such as the CityTracker.
=====================================
ntpd/refclock_mx4200.c
=====================================
--- a/ntpd/refclock_mx4200.c
+++ b/ntpd/refclock_mx4200.c
@@ -26,26 +26,13 @@
#include "mx4200.h"
-#ifdef HAVE_SYS_PPSCLOCK_H
-# include <sys/ppsclock.h>
-#endif
-
-struct ppsclockev {
- struct timespec tv;
- u_int serial;
-};
-
#ifdef HAVE_PPSAPI
# include "ppsapi_timepps.h"
#endif /* HAVE_PPSAPI */
/*
* This driver supports the Magnavox Model MX 4200 GPS Receiver
- * adapted to precision timing applications. It requires the
- * ppsclock line discipline or streams module described in the
- * Line Disciplines and Streams Drivers page. It also requires a
- * gadget box and 1-PPS level converter, such as described in the
- * Pulse-per-second (PPS) Signal Interfacing page.
+ * adapted to precision timing applications. It requires the PPS API.
*
* It's likely that other compatible Magnavox receivers such as the
* MX 4200D, MX 9212, MX 9012R, MX 9112 will be supported by this code.
@@ -86,7 +73,6 @@ struct mx4200unit {
u_int pollcnt; /* poll message counter */
u_int polled; /* Hand in a time sample? */
u_int lastserial; /* last pps serial number */
- struct ppsclockev ppsev; /* PPS control structure */
double avg_lat; /* average latitude */
double avg_lon; /* average longitude */
double avg_alt; /* average height */
=====================================
ntpd/refclock_parse.c
=====================================
--- a/ntpd/refclock_parse.c
+++ b/ntpd/refclock_parse.c
@@ -84,9 +84,6 @@
# include "refclock_atom.h"
#endif
-#ifdef HAVE_SYS_PPSCLOCK_H
-# include <sys/ppsclock.h>
-#endif
#ifdef HAVE_LINUX_SERIAL_H
# include <linux/serial.h>
#endif
@@ -1776,7 +1773,7 @@ local_input(
if (!PARSE_PPS(parse->parseio.parse_dtime.parse_state))
{
#ifdef HAVE_PPSAPI
- if (parse->flags & PARSE_PPSCLOCK)
+ if (parse->flags & PARSE_PPSAPI)
{
struct timespec pps_timeout;
pps_info_t pps_info;
@@ -2295,7 +2292,7 @@ parse_shutdown(
}
#ifdef HAVE_PPSAPI
- if (parse->flags & PARSE_PPSCLOCK)
+ if (parse->flags & PARSE_PPSAPI)
{
(void)time_pps_destroy(parse->atom.handle);
}
@@ -2390,7 +2387,7 @@ parse_ppsapi(
int cap, mode_ppsoffset;
const char *cp;
- parse->flags &= (uint8_t) (~PARSE_PPSCLOCK);
+ parse->flags &= (uint8_t) (~PARSE_PPSAPI);
/*
* collect PPSAPI offset capability - should move into generic handling
@@ -2453,7 +2450,7 @@ parse_ppsapi(
return false;
}
- parse->flags |= PARSE_PPSCLOCK;
+ parse->flags |= PARSE_PPSAPI;
return true;
}
#else
@@ -2646,7 +2643,7 @@ parse_start(
msyslog(LOG_NOTICE,
"refclock_parse: optional PPS processing not available");
} else {
- parse->flags |= PARSE_PPSCLOCK;
+ parse->flags |= PARSE_PPSAPI;
#ifdef ASYNC_PPS_CD_NEG
NLOG(NLOG_CLOCKINFO)
msyslog(LOG_INFO,
=====================================
ntpd/refclock_zyfer.c
=====================================
--- a/ntpd/refclock_zyfer.c
+++ b/ntpd/refclock_zyfer.c
@@ -17,9 +17,6 @@
#include <ctype.h>
#include <termios.h>
-#ifdef HAVE_SYS_PPSCLOCK_H
-# include <sys/ppsclock.h>
-#endif
/*
* This driver provides support for the TOD serial port of a Zyfer GPStarplus.
=====================================
pylib/configure.py
=====================================
--- a/pylib/configure.py
+++ b/pylib/configure.py
@@ -282,7 +282,6 @@ def cmd_configure(ctx):
"sys/ioctl.h",
"sys/modem.h",
"sys/prctl.h",
- "sys/ppsclock.h",
"sys/procset.h",
"sys/sockio.h",
"sys/soundcard.h",
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/e9392efab1b70af4074e1f5b84ca6e00a35ac0ff
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20151123/966f54c9/attachment.html>
More information about the vc
mailing list