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_oncore.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_oncore.c')
| -rw-r--r-- | driver_oncore.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/driver_oncore.c b/driver_oncore.c index 0152933a..0179b53f 100644 --- a/driver_oncore.c +++ b/driver_oncore.c @@ -454,8 +454,8 @@ static void oncore_event_hook(struct gps_device_t *session, event_t event) } } -#ifdef NTPSHM_ENABLE -static double oncore_ntp_offset(struct gps_device_t *session UNUSED) +#ifdef TIMESERVICE_ENABLE +static double oncore_time_offset(struct gps_device_t *session UNUSED) { /* * Only one sentence (NAVSOL) ships time. 0.175 seems best at @@ -464,7 +464,7 @@ static double oncore_ntp_offset(struct gps_device_t *session UNUSED) */ return 0.175; } -#endif /* NTPSHM_ENABLE */ +#endif /* TIMESERVICE_ENABLE */ static gps_mask_t oncore_parse_input(struct gps_device_t *session) { @@ -503,9 +503,9 @@ const struct gps_type_t oncore_binary = { /* Control string sender - should provide checksum and headers/trailer */ .control_send = oncore_control_send, /* to send control strings */ #endif /* CONTROLSEND_ENABLE */ -#ifdef NTPSHM_ENABLE - .ntp_offset = oncore_ntp_offset, /* NTP offset array */ -#endif /* NTPSHM_ENABLE */ +#ifdef TIMESERVICE_ENABLE + .time_offset = oncore_time_offset, /* NTP offset array */ +#endif /* TIMESERVICE_ENABLE */ }; /* *INDENT-ON* */ #endif /* defined(ONCORE_ENABLE) && defined(BINARY_ENABLE) */ |