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 /driver_geostar.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 'driver_geostar.c')
| -rw-r--r-- | driver_geostar.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/driver_geostar.c b/driver_geostar.c index d819e4ad..fd264d5f 100644 --- a/driver_geostar.c +++ b/driver_geostar.c @@ -599,12 +599,12 @@ static void geostar_mode(struct gps_device_t *session, int mode) } #endif /* RECONFIGURE_ENABLE */ -#ifdef NTPSHM_ENABLE -static double geostar_ntp_offset(struct gps_device_t *session UNUSED) +#ifdef TIMESERVICE_ENABLE +static double geostar_time_offset(struct gps_device_t *session UNUSED) { return 0.31; } -#endif /* NTPSHM_ENABLE */ +#endif /* TIMESERVICE_ENABLE */ /* this is everything we export */ /* *INDENT-OFF* */ @@ -629,9 +629,9 @@ const struct gps_type_t geostar_binary = #ifdef CONTROLSEND_ENABLE .control_send = geostar_control_send,/* how to send commands */ #endif /* CONTROLSEND_ENABLE */ -#ifdef NTPSHM_ENABLE - .ntp_offset = geostar_ntp_offset, -#endif /* NTPSHM_ENABLE */ +#ifdef TIMESERVICE_ENABLE + .time_offset = geostar_time_offset, +#endif /* TIMESERVICE_ENABLE */ }; /* *INDENT-ON* */ |