diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2013-10-30 12:32:12 -0400 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2013-10-30 12:39:26 -0400 |
| commit | d9b8758935f902fb0ea77fee09e9627e09462a11 (patch) | |
| tree | d6dbb060ce2162abe50b6dcada9b23c0a80ad63d /subframe.c | |
| parent | 7a5a25946be3db4bd8c08d1a5b126f43131144eb (diff) | |
| download | gpsd-d9b8758935f902fb0ea77fee09e9627e09462a11.tar.gz | |
Separate ntpd support from chrony support, step 1.
ntp_offset becomes time_offset. There is a new config symbol CHRONY_ENABLE;
most time service code is npw controlled by TIMESERVICE_ENABLE. The
file ntpshm.c becomes timeexport.c
This change is not complete. More disentanglement has to be done inside
timeexport.c itself; at the moment enabling one but not both of
ntpshm or chrony will probably break its compile. The point of getting
this commit out is so Gary will see the new baseline code ASAP.
All regression tests pass.
Diffstat (limited to 'subframe.c')
| -rw-r--r-- | subframe.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -728,7 +728,7 @@ gps_mask_t gpsd_interpret_subframe(struct gps_device_t *session, subp->sub4_18.leap, subp->sub4_18.WNlsf, subp->sub4_18.DN, subp->sub4_18.lsf); -#ifdef NTPSHM_ENABLE +#ifdef TIMESERVICE_ENABLE /* IS-GPS-200 Revision E, paragraph 20.3.3.5.2.4 */ if (((session->context->gps_week % 256) == (unsigned short)subp->sub4_18.WNlsf) && /* notify the leap seconds correction in the end of current day */ @@ -742,7 +742,7 @@ gps_mask_t gpsd_interpret_subframe(struct gps_device_t *session, session->context->leap_notify = LEAP_NOWARNING; } else session->context->leap_notify = LEAP_NOWARNING; -#endif /* NTPSHM_ENABLE */ +#endif /* TIMESERVICE_ENABLE */ session->context->leap_seconds = (int)subp->sub4_18.leap; session->context->valid |= LEAP_SECOND_VALID; |