diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2011-01-21 13:11:29 -0500 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2011-01-21 13:11:29 -0500 |
| commit | 8f1e00a014dc76401462e1e7deb8cfdc8688b430 (patch) | |
| tree | a31dd13b5acc7d3da36b5094ece713eaf4cafab0 /driver_italk.c | |
| parent | cf89a66439c7fc4a950860d628383e341b692255 (diff) | |
| download | gpsd-8f1e00a014dc76401462e1e7deb8cfdc8688b430.tar.gz | |
Refactor time handling yet again. All regression tests pass.
Diffstat (limited to 'driver_italk.c')
| -rw-r--r-- | driver_italk.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/driver_italk.c b/driver_italk.c index 62702d82..a8e7ce84 100644 --- a/driver_italk.c +++ b/driver_italk.c @@ -60,7 +60,7 @@ static gps_mask_t decode_itk_navfix(struct gps_device_t *session, || 0 == (flags & FIXINFO_FLAG_VALID)) return mask; - session->newdata.time = gpsd_resolve_time(session, + session->newdata.time = gpsd_gpstime_resolve(session, (unsigned short) getles16(buf, 7 + 82), (unsigned int)getleu32(buf, 7 + 84) / 1000.0); mask |= TIME_IS; @@ -129,7 +129,7 @@ static gps_mask_t decode_itk_prnstatus(struct gps_device_t *session, gpsd_report(LOG_PROG, "ITALK: runt PRN_STATUS (len=%zu)\n", len); mask = 0; } else { - session->gpsdata.skyview_time = gpsd_resolve_time(session, + session->gpsdata.skyview_time = gpsd_gpstime_resolve(session, (unsigned short)getleu16(buf, 7 + 4), (unsigned int)getleu32(buf, 7 + 6) / 1000.0), gpsd_zero_satellites(&session->gpsdata); @@ -187,7 +187,7 @@ static gps_mask_t decode_itk_utcionomodel(struct gps_device_t *session, if (session->context->leap_seconds < leap) session->context->leap_seconds = leap; - session->newdata.time = gpsd_resolve_time(session, + session->newdata.time = gpsd_gpstime_resolve(session, (unsigned short) getleu16(buf, 7 + 36), (unsigned int)getleu32(buf, 7 + 38) / 1000.0); gpsd_report(LOG_DATA, @@ -251,7 +251,7 @@ static gps_mask_t decode_itk_pseudo(struct gps_device_t *session, if ((flags & 0x3) != 0x3) return 0; // bail if measurement time not valid. - session->newdata.time = gpsd_resolve_time(session, + session->newdata.time = gpsd_gpstime_resolve(session, (unsigned short int) getleu16(buf, 7 + 8), (unsigned int)getleu32(buf, 7 + 38) / 1000.0); |