diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2013-10-30 23:11:40 -0400 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2013-10-30 23:11:40 -0400 |
| commit | 7094b0fbbbf49a2339108edd7dc0af52841834e7 (patch) | |
| tree | 3c19d75601139b43e34fd7e9febead8557610908 /driver_garmin.c | |
| parent | 56e9094724cd76cba6a2036a399667bbddb7f109 (diff) | |
| download | gpsd-7094b0fbbbf49a2339108edd7dc0af52841834e7.tar.gz | |
Revert "Separate ntpd support from chrony support, step 1."
We'll have to sneak up on this change more slowly.
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 e51beda0..32015573 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 TIMESERVICE_ENABLE -static double garmin_time_offset(struct gps_device_t *session) +#ifdef NTPSHM_ENABLE +static double garmin_ntp_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_time_offset(struct gps_device_t *session) } return 0.430; /* WTF? WAG */ } -#endif /* TIMESERVICE_ENABLE */ +#endif /* NTPSHM_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 TIMESERVICE_ENABLE - .time_offset = garmin_time_offset, -#endif /* ENABLE ENABLE */ +#ifdef NTPSHM_ENABLE + .ntp_offset = garmin_ntp_offset, +#endif /* NTPSHM_ 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 TIMESERVICE_ENABLE - .time_offset = garmin_time_offset, -#endif /* ENABLE ENABLE */ +#ifdef NTPSHM_ENABLE + .ntp_offset = garmin_ntp_offset, +#endif /* NTPSHM_ 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 TIMESERVICE_ENABLE - .time_offset = garmin_time_offset, -#endif /* ENABLE ENABLE */ +#ifdef NTPSHM_ENABLE + .ntp_offset = garmin_ntp_offset, +#endif /* NTPSHM_ ENABLE */ }; /* *INDENT-ON* */ |