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_zodiac.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_zodiac.c')
| -rw-r--r-- | driver_zodiac.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/driver_zodiac.c b/driver_zodiac.c index 5ab969a1..296dbece 100644 --- a/driver_zodiac.c +++ b/driver_zodiac.c @@ -445,8 +445,8 @@ static bool zodiac_speed_switch(struct gps_device_t *session, } #endif /* RECONFIGURE_ENABLE */ -#ifdef TIMESERVICE_ENABLE -static double zodiac_time_offset(struct gps_device_t *session UNUSED) +#ifdef NTPSHM_ENABLE +static double zodiac_ntp_offset(struct gps_device_t *session UNUSED) { /* Removing/changing the magic number below is likely to disturb * the handling of the 1pps signal from the gps device. The regression @@ -454,7 +454,7 @@ static double zodiac_time_offset(struct gps_device_t *session UNUSED) * with the 1pps signal active is required. */ return 1.1; } -#endif /* TIMESERVICE_ENABLE */ +#endif /* NTPSHM_ENABLE */ /* this is everything we export */ /* *INDENT-OFF* */ @@ -479,9 +479,9 @@ const struct gps_type_t zodiac_binary = #ifdef CONTROLSEND_ENABLE .control_send = zodiac_control_send, /* for gpsctl and friends */ #endif /* CONTROLSEND_ENABLE */ -#ifdef TIMESERVICE_ENABLE - .time_offset = zodiac_time_offset, /* compute NTO fudge factor */ -#endif /* TIMESERVICE_ENABLE */ +#ifdef NTPSHM_ENABLE + .ntp_offset = zodiac_ntp_offset, /* compute NTO fudge factor */ +#endif /* NTPSHM_ENABLE */ }; /* *INDENT-ON* */ |