diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2015-02-23 14:40:31 -0500 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2015-02-23 14:40:31 -0500 |
| commit | da96a95a9a85299b228dacbe345c5499736d36dc (patch) | |
| tree | a2e421462548c91edc833e095d53725f8840195e /gpsd.h-tail | |
| parent | 0747ffe258042efe53c10964c579af62c7b8ae30 (diff) | |
| download | gpsd-da96a95a9a85299b228dacbe345c5499736d36dc.tar.gz | |
TOFF JSON message implemented and documented.
All regression tests pass. PPS observed live with gosmon.
gpsmon presently ignores this message, but shout display its contents near PPS.
Diffstat (limited to 'gpsd.h-tail')
| -rw-r--r-- | gpsd.h-tail | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gpsd.h-tail b/gpsd.h-tail index a9d25063..78cb4e44 100644 --- a/gpsd.h-tail +++ b/gpsd.h-tail @@ -492,13 +492,15 @@ struct gps_device_t { timestamp_t sor; /* timestamp start of this reporting cycle */ unsigned long chars; /* characters in the cycle */ #endif /* TIMING_ENABLE */ -#ifdef NTPSHM_ENABLE +#ifdef NTP_ENABLE bool ship_to_ntpd; +#ifdef NTPSHM_ENABLE volatile /*@null@*/ struct shmTime *shm_clock; +#endif /* NTPSHM_ENABLE */ # ifdef PPS_ENABLE volatile /*@null@*/ struct shmTime *shm_pps; # endif /* PPS_ENABLE */ -#endif /* NTPSHM_ENABLE */ +#endif /* NTP_ENABLE */ volatile struct { timestamp_t real; /* clock must be a timespec as it is in nSec and @@ -872,14 +874,16 @@ extern void nmea_subframe_dump(struct gps_device_t *, /*@out@*/char[], size_t); extern void nmea_ais_dump(struct gps_device_t *, /*@out@*/char[], size_t); extern unsigned int ais_binary_encode(struct ais_t *ais, /*@out@*/unsigned char *bits, int flag); +#ifdef NTP_ENABLE +extern void ntp_latch(struct gps_device_t *device, /*@out@*/struct timedelta_t *td); #ifdef NTPSHM_ENABLE extern void ntpshm_context_init(struct gps_context_t *); extern void ntpshm_session_init(struct gps_device_t *); extern int ntpshm_put(struct gps_device_t *, volatile struct shmTime *, struct timedrift_t *); -extern void ntpshm_latch(struct gps_device_t *device, /*@out@*/struct timedrift_t *td); extern void ntpshm_link_deactivate(struct gps_device_t *); extern void ntpshm_link_activate(struct gps_device_t *); #endif /* NTPSHM_ENABLE */ +#endif /* NTP_ENABLE */ #ifdef PPS_ENABLE extern void pps_early_init(struct gps_context_t *); #endif /* PPS_ENABLE */ |