diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2015-03-08 08:22:00 -0400 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2015-03-08 08:22:00 -0400 |
| commit | e79b15c162bebb04bbeb50ab786a22f2fb84c735 (patch) | |
| tree | 813a414793f39a7a2359c9cddc59d3f8b9536b56 /driver_tsip.c | |
| parent | ffa6d0965c626b0fa8e3b9eeaaeff9a5f3ac5bfa (diff) | |
| download | gpsd-e79b15c162bebb04bbeb50ab786a22f2fb84c735.tar.gz | |
A step toards float elimination. No code changes.
Diffstat (limited to 'driver_tsip.c')
| -rw-r--r-- | driver_tsip.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/driver_tsip.c b/driver_tsip.c index 6e503841..750b990e 100644 --- a/driver_tsip.c +++ b/driver_tsip.c @@ -266,7 +266,8 @@ static gps_mask_t tsip_parse_input(struct gps_device_t *session) session->context->leap_seconds = (int)round(f2); session->context->valid |= LEAP_SECOND_VALID; session->newdata.time = - gpsd_gpstime_resolve(session, (unsigned short)s1, (double)f1); + (timestamp_t)gpsd_gpstime_resolve(session, + (unsigned short)s1, (double)f1); mask |= TIME_SET | PPSTIME_IS; } gpsd_log(&session->context->errout, LOG_INF, @@ -371,7 +372,7 @@ static gps_mask_t tsip_parse_input(struct gps_device_t *session) f2 = getbef32((char *)buf, 16); /* time-of-fix */ if ((session->context->valid & GPS_TIME_VALID)!=0) { session->newdata.time = - gpsd_gpstime_resolve(session, + (timestamp_t)gpsd_gpstime_resolve(session, (unsigned short)session->context->gps_week, (double)f2); mask |= TIME_SET | PPSTIME_IS; @@ -645,7 +646,7 @@ static gps_mask_t tsip_parse_input(struct gps_device_t *session) f1 = getbef32((char *)buf, 32); /* time-of-fix */ if ((session->context->valid & GPS_TIME_VALID)!=0) { session->newdata.time = - gpsd_gpstime_resolve(session, + (timestamp_t)gpsd_gpstime_resolve(session, (unsigned short)session->context->gps_week, (double)f1); mask |= TIME_SET | PPSTIME_IS; @@ -740,7 +741,7 @@ static gps_mask_t tsip_parse_input(struct gps_device_t *session) session->context->leap_seconds = (int)u4; session->context->valid |= LEAP_SECOND_VALID; } - session->newdata.time = gpsd_gpstime_resolve(session, + session->newdata.time = (timestamp_t)gpsd_gpstime_resolve(session, (unsigned short)s4, (double)ul1 *1e-3); mask |= @@ -780,7 +781,7 @@ static gps_mask_t tsip_parse_input(struct gps_device_t *session) session->context->valid |= LEAP_SECOND_VALID; } session->newdata.time = - gpsd_gpstime_resolve(session, + (timestamp_t)gpsd_gpstime_resolve(session, (unsigned short)s1, (double)ul1 *1e3); session->gpsdata.status = STATUS_NO_FIX; session->newdata.mode = MODE_NO_FIX; @@ -843,7 +844,8 @@ static gps_mask_t tsip_parse_input(struct gps_device_t *session) session->context->leap_seconds = (int)s2; session->context->valid |= LEAP_SECOND_VALID; session->newdata.time = - gpsd_gpstime_resolve(session, (unsigned short)s1, (double)ul1); + (timestamp_t)gpsd_gpstime_resolve(session, + (unsigned short)s1, (double)ul1); mask |= TIME_SET | PPSTIME_IS | CLEAR_IS; gpsd_log(&session->context->errout, LOG_DATA, "SP-TTS 0xab time=%.2f mask={TIME}\n", |