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_proto.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_proto.c')
| -rw-r--r-- | driver_proto.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/driver_proto.c b/driver_proto.c index f9f7f060..f14e0e75 100644 --- a/driver_proto.c +++ b/driver_proto.c @@ -453,8 +453,8 @@ static void _proto__set_mode(struct gps_device_t *session, int mode) } #endif /* RECONFIGURE_ENABLE */ -#ifdef NTPSHM_ENABLE -static double _proto_ntp_offset(struct gps_device_t *session) +#ifdef TIMESERVICE_ENABLE +static double _proto_time_offset(struct gps_device_t *session) { /* * If NTP notification is enabled, the GPS will occasionally NTP @@ -468,7 +468,7 @@ static double _proto_ntp_offset(struct gps_device_t *session) */ return MAGIC_CONSTANT; } -#endif /* NTPSHM_ENABLE */ +#endif /* TIMESERVICE_ENABLE */ static void _proto__wrapup(struct gps_device_t *session) { @@ -525,9 +525,9 @@ const struct gps_type_t _proto__binary = { /* Control string sender - should provide checksum and headers/trailer */ .control_send = _proto__control_send, #endif /* CONTROLSEND_ENABLE */ -#ifdef NTPSHM_ENABLE - .ntp_offset = _proto_ntp_offset, -#endif /* NTPSHM_ENABLE */ +#ifdef TIMESERVICE_ENABLE + .time_offset = _proto_time_offset, +#endif /* TIMESERVICE_ENABLE */ /* *INDENT-ON* */ }; #endif /* defined(_PROTO__ENABLE) && defined(BINARY_ENABLE) */ |