[Git][NTPsec/ntpsec][master] 3 commits: Clean up after some earlier driver removals.
Eric S. Raymond
gitlab at mg.gitlab.com
Tue Jun 21 14:09:49 UTC 2016
Eric S. Raymond pushed to branch master at NTPsec / ntpsec
Commits:
d9c103fc by Eric S. Raymond at 2016-06-21T09:10:57-04:00
Clean up after some earlier driver removals.
- - - - -
aa74463e by Eric S. Raymond at 2016-06-21T09:59:39-04:00
Remove a dead #define.
- - - - -
1e14e64d by Eric S. Raymond at 2016-06-21T10:09:11-04:00
Remove some remnants of the old build system.
- - - - -
5 changed files:
- libntp/clocktypes.c
- libparse/README
- − libparse/mkinfo_rcmd.sed
- − libparse/mkinfo_scmd.sed
- ntpd/refclock_dumbclock.c
Changes:
=====================================
libntp/clocktypes.c
=====================================
--- a/libntp/clocktypes.c
+++ b/libntp/clocktypes.c
@@ -50,8 +50,8 @@ struct clktype clktypes[] = {
"NOT_USED" },
{ REFCLK_GPS_NMEA, "Generic NMEA GPS Receiver (20)",
"GPS_NMEA" },
- { REFCLK_GPS_VME, "TrueTime GPS-VME Interface (21)",
- "GPS_VME" },
+ { REFCLK_GPS_VME, "not used (21)",
+ "NOT_USED" },
{ REFCLK_ATOM_PPS, "PPS Clock Discipline (22)",
"PPS" },
{ REFCLK_NONE, "not used (23)",
@@ -64,7 +64,7 @@ struct clktype clktypes[] = {
"GPS_HP" },
{ REFCLK_NONE, "not used (27)",
"NOT_USED" },
- { REFCLK_SHM, "Clock attached thru shared Memory (28)",
+ { REFCLK_SHM, "Clock attached thru shared memory (28)",
"SHM" },
{ REFCLK_PALISADE, "Trimble Navigation Palisade GPS (29)",
"GPS_PALISADE" },
@@ -78,8 +78,8 @@ struct clktype clktypes[] = {
"DUMBCLOCK" },
{ REFCLK_NONE, "not used (34)",
"NOT_USED" },
- { REFCLK_PCF, "Conrad parallel port radio clock (35)",
- "PCF"},
+ { REFCLK_PCF, "not used (35)",
+ "NOT_USED"},
{ REFCLK_NONE, "not used (36)",
"NOT_USED" },
{ REFCLK_NONE, "not used (37)",
@@ -100,8 +100,8 @@ struct clktype clktypes[] = {
"NOT_USED" },
{ REFCLK_NEOCLOCK4X, "NeoClock4X DCF77 / TDF receiver (44)",
"NEOCLK4X"},
- { REFCLK_TSYNCPCI, "Spectracom TSYNC PCI timing board (45)",
- "PCI_TSYNC"},
+ { REFCLK_TSYNCPCI, "not used (45)",
+ "NOT_USED"},
{ REFCLK_GPSDJSON, "GPSD JSON socket (46)",
"GPSD_JSON"},
{ -1, "", "" }
=====================================
libparse/README
=====================================
--- a/libparse/README
+++ b/libparse/README
@@ -22,16 +22,17 @@ The structure of the parse reference clock driver is as follows:
the tty parameters and the NTP parameters.
refclock_parse operates on an abstract reference clock
- that delivers time stamps and stati. Offsets and sychron-
+ that delivers time stamps and statuses. Offsets and sychron-
isation information is derived from this data and passed
- on to refclock_receive of xntp which uses that data for
+ on to refclock_receive of ntpd which uses that data for
syncronisation.
The abstract reference clock is generated by the parse*
routines. They parse the incoming data stream from the
clock and convert it to the appropriate time stamps.
- The data is also mapped int the abstract clock states
- POWERUP - clock has no valid phase and time code
+ The data is also mapped into the abstract clock states
+
+ POWERUP - clock has no valid phase and time code
information
NOSYNC - Time code is not confirmed, phase is probably
@@ -53,7 +54,7 @@ The structure of the parse reference clock driver is as follows:
loopfilter. For clock with accurate once a second time
information this means big improvements for time keeping.
A prerequisite for passing on the time stamps to
- the loopfilter is, that the clock is in synchronised state.
+ the loopfilter is that the clock is in synchronised state.
parse.c These are the general routines to parse the incoming data
stream. Usually these routines should not require
@@ -62,8 +63,8 @@ The structure of the parse reference clock driver is as follows:
clk_*.c These files hold the conversion code for the time stamps
and the description how the time code can be parsed and
where the time stamps are to be taken.
- If you want to add a new clock type this is the file
- you need to write in addition to mention it in
+ If you want to add a new clock type, this is the file
+ you need to write in addition to mentioning it in
parse_conf.c and setting up the NTP and TTY parameters
in refclock_parse.c.
=====================================
libparse/mkinfo_rcmd.sed deleted
=====================================
--- a/libparse/mkinfo_rcmd.sed
+++ /dev/null
@@ -1,8 +0,0 @@
-1i\
-\
-\
-cmd_info_t trimble_rcmds[] = {
-s!^#define[ \ ][ \ ]*\(CMD_R[^ \ ]*\)[ \ ][ \ ]*\([^ \ ]*\)[ \ ][ \ ]*/\*[ \ ][ \ ]*\(.*\)[ \ ]*:\([^:]*\):\([^:]*\)[ \ ][ \ ]*\*/!\ { \1, "\1", "\3 (\2)", "\4", \5 },!p
-$a\
-\ { 0xFF, "", "", "", 0 }\
-};
=====================================
libparse/mkinfo_scmd.sed deleted
=====================================
--- a/libparse/mkinfo_scmd.sed
+++ /dev/null
@@ -1,15 +0,0 @@
-1i\
-/*\
-\ * Automatically generated - do not modify\
-\ */\
-\
-#include <config.h>\
-#include "ntp_types.h"\
-#include "ntpd.h"\
-#include "trimble.h"\
-\
-cmd_info_t trimble_scmds[] = {
-s!^#define[ ][ ]*\(CMD_C[^ ]*\)[ ][ ]*\([^ ]*\)[ ][ ]*/\*[ ][ ]*\(.*\)[ ][ ]*\*/! { \1, "\1", "\3 (\2)", "", 0 },!p
-$a\
-\ { 0xFF, "", "", "", 0 }\
-};
=====================================
ntpd/refclock_dumbclock.c
=====================================
--- a/ntpd/refclock_dumbclock.c
+++ b/ntpd/refclock_dumbclock.c
@@ -3,11 +3,6 @@
* that only provides hh:mm:ss (in local time, yet!).
*/
-/*
- * Must interpolate back to local time. Very annoying.
- */
-#define GET_LOCALTIME
-
#include <config.h>
#include "ntpd.h"
#include "ntp_io.h"
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/12d122cdc2e3773a20ae0e16f77ee0352d95cbc5...1e14e64dd7e788ec8350b3f93ddb1c3a9064f523
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20160621/c6a16276/attachment.html>
More information about the vc
mailing list