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_garmin.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_garmin.c')
| -rw-r--r-- | driver_garmin.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/driver_garmin.c b/driver_garmin.c index 32015573..e51beda0 100644 --- a/driver_garmin.c +++ b/driver_garmin.c @@ -1224,8 +1224,8 @@ static ssize_t garmin_control_send(struct gps_device_t *session, } #endif /* CONTROLSEND_ENABLE */ -#ifdef NTPSHM_ENABLE -static double garmin_ntp_offset(struct gps_device_t *session) +#ifdef TIMESERVICE_ENABLE +static double garmin_time_offset(struct gps_device_t *session) { if (session->sourcetype == source_usb) { return 0.035; /* Garmin USB, expect +/- 40mS jitter */ @@ -1244,7 +1244,7 @@ static double garmin_ntp_offset(struct gps_device_t *session) } return 0.430; /* WTF? WAG */ } -#endif /* NTPSHM_ENABLE */ +#endif /* TIMESERVICE_ENABLE */ /* this is everything we export */ #ifdef __UNUSED__ @@ -1391,9 +1391,9 @@ const struct gps_type_t garmin_usb_binary_old = #ifdef CONTROLSEND_ENABLE .control_send = garmin_control_send, /* send raw bytes */ #endif /* CONTROLSEND_ENABLE */ -#ifdef NTPSHM_ENABLE - .ntp_offset = garmin_ntp_offset, -#endif /* NTPSHM_ ENABLE */ +#ifdef TIMESERVICE_ENABLE + .time_offset = garmin_time_offset, +#endif /* ENABLE ENABLE */ }; /* *INDENT-ON* */ #endif /* __UNUSED__ */ @@ -1420,9 +1420,9 @@ const struct gps_type_t garmin_usb_binary = #ifdef CONTROLSEND_ENABLE .control_send = garmin_control_send, /* send raw bytes */ #endif /* CONTROLSEND_ENABLE */ -#ifdef NTPSHM_ENABLE - .ntp_offset = garmin_ntp_offset, -#endif /* NTPSHM_ ENABLE */ +#ifdef TIMESERVICE_ENABLE + .time_offset = garmin_time_offset, +#endif /* ENABLE ENABLE */ }; /* *INDENT-ON* */ @@ -1448,9 +1448,9 @@ const struct gps_type_t garmin_ser_binary = #ifdef CONTROLSEND_ENABLE .control_send = garmin_control_send, /* send raw bytes */ #endif /* CONTROLSEND_ENABLE */ -#ifdef NTPSHM_ENABLE - .ntp_offset = garmin_ntp_offset, -#endif /* NTPSHM_ ENABLE */ +#ifdef TIMESERVICE_ENABLE + .time_offset = garmin_time_offset, +#endif /* ENABLE ENABLE */ }; /* *INDENT-ON* */ |