diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2013-10-31 23:49:55 -0400 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2013-10-31 23:49:55 -0400 |
| commit | 2ae441d42411d416e9e3f39c60f6c14d23708f74 (patch) | |
| tree | 37b14bf6edc83e62ab1d14d64040161d91f75220 /gpsd.h-tail | |
| parent | 5af8826c921dfe73e04a24e1e092a04c97f577a2 (diff) | |
| download | gpsd-2ae441d42411d416e9e3f39c60f6c14d23708f74.tar.gz | |
Contain the assumption that time hinting is done to NTPD.
Because it might be going to chrony. Or something else.
No logic changes, just name changes and one new derived #define,
TIMEHINT_ENABLE.
Diffstat (limited to 'gpsd.h-tail')
| -rw-r--r-- | gpsd.h-tail | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/gpsd.h-tail b/gpsd.h-tail index f555fda9..87c31386 100644 --- a/gpsd.h-tail +++ b/gpsd.h-tail @@ -83,6 +83,9 @@ typedef unsigned int speed_t; #if defined(TNT_ENABLE) || defined(OCEANSERVER_ENABLE) #define COMPASS_ENABLE #endif +#ifdef NTPSHM_ENABLE +#define TIMEHINT_ENABLE +#endif /* First, declarations for the packet layer... */ @@ -239,7 +242,7 @@ struct gps_context_t { double gps_tow; /* GPS time of week, actually 19 bits */ int century; /* for NMEA-only devices without ZDA */ int rollovers; /* rollovers since start of run */ -#ifdef NTPSHM_ENABLE +#ifdef TIMEHINT_ENABLE int leap_notify; /* notification state from subframe */ #define LEAP_NOWARNING 0x0 /* normal, no leap second warning */ #define LEAP_ADDSECOND 0x1 /* last minute of day has 60 seconds */ @@ -250,7 +253,7 @@ struct gps_context_t { * 'optimize' as 'dead code' the writes to SHM */ /*@reldef@*/volatile struct shmTime *shmTime[NTPSHMSEGS]; bool shmTimeInuse[NTPSHMSEGS]; -#endif /* NTPSHM_ENABLE */ +#endif /* TIMEHINT_ENABLE */ # ifdef PPS_ENABLE /*@null@*/ void (*pps_hook)(struct gps_device_t *, unsigned long, struct timespec *); @@ -348,9 +351,9 @@ struct gps_type_t { #ifdef CONTROLSEND_ENABLE /*@null@*/ssize_t (*control_send)(struct gps_device_t *session, char *buf, size_t buflen); #endif /* CONTROLSEND_ENABLE */ -#ifdef NTPSHM_ENABLE - /*@null@*/double (*ntp_offset)(struct gps_device_t *session); -#endif /* NTPSHM_ENABLE */ +#ifdef TIMEHINT_ENABLE + /*@null@*/double (*time_offset)(struct gps_device_t *session); +#endif /* TIMEHINT_ENABLE */ }; /* |