diff options
| author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2015-04-07 08:29:34 +0000 |
|---|---|---|
| committer | <> | 2015-04-13 18:52:43 +0000 |
| commit | b2ccf8dd31d1457ae9f0ae270054117179220370 (patch) | |
| tree | 4ccd4a16d5e9ef5869630ba624e822665a6e248c /libparse/gpstolfp.c | |
| parent | bdab5265fcbf3f472545073a23f8999749a9f2b9 (diff) | |
| download | ntp-master.tar.gz | |
Imported from /home/lorry/working-area/delta_ntp/ntp-4.2.8p2.tar.gz.HEADntp-4.2.8p2master
Diffstat (limited to 'libparse/gpstolfp.c')
| -rw-r--r-- | libparse/gpstolfp.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libparse/gpstolfp.c b/libparse/gpstolfp.c index 5354dd3..c162429 100644 --- a/libparse/gpstolfp.c +++ b/libparse/gpstolfp.c @@ -34,10 +34,8 @@ */ #include <config.h> #include "ntp_fp.h" - -#define GPSORIGIN 2524953600UL /* NTP origin - GPS origin in seconds */ -#define SECSPERWEEK (unsigned)(604800) /* seconds per week - GPS tells us about weeks */ -#define GPSWRAP 990 /* assume week count less than this in the previous epoch */ +#include "ntp_calendar.h" +#include "parse.h" void gpstolfp( @@ -49,10 +47,10 @@ gpstolfp( { if (weeks < GPSWRAP) { - weeks += 1024; + weeks += GPSWEEKS; } - lfp->l_ui = weeks * SECSPERWEEK + days * 86400 + seconds + GPSORIGIN; /* convert to NTP time */ + lfp->l_ui = (uint32_t)(weeks * SECSPERWEEK + days * SECSPERDAY + seconds + GPSORIGIN); /* convert to NTP time */ lfp->l_uf = 0; } |