diff options
author | Eric S. Raymond <esr@thyrsus.com> | 2015-01-21 12:56:08 -0500 |
---|---|---|
committer | Eric S. Raymond <esr@thyrsus.com> | 2015-01-21 12:56:08 -0500 |
commit | a61e28529df634963c0967e59aae673f8fc7741e (patch) | |
tree | 2c8e5c9ed1ff63870f8a94bd33ecd08a9825caa7 /driver_oncore.c | |
parent | f351f5981604338db80e2b2864b7dcb818e7fc61 (diff) | |
download | gpsd-a61e28529df634963c0967e59aae673f8fc7741e.tar.gz |
Easy splint cleanups. All regression tests pass.
Diffstat (limited to 'driver_oncore.c')
-rw-r--r-- | driver_oncore.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/driver_oncore.c b/driver_oncore.c index 9a2808a5..36c26de3 100644 --- a/driver_oncore.c +++ b/driver_oncore.c @@ -108,6 +108,9 @@ oncore_msg_navsol(struct gps_device_t *session, unsigned char *buf, unpacked_date.tm_min = (int)getub(buf, 9); unpacked_date.tm_sec = (int)getub(buf, 10); unpacked_date.tm_isdst = 0; +#ifdef S_SPLINT_S + unpacked_date. tm_wday = unpacked_date. tm_yday = 0; +#endif /* S_SPLINT_S */ nsec = (uint) getbeu32(buf, 11); /*@ -unrecog */ @@ -164,14 +167,14 @@ oncore_msg_navsol(struct gps_device_t *session, unsigned char *buf, "%2d %2d %2d %3d %02x\n", i, sv, mode, sn, status); if (sn) { - session->gpsdata.skyview[st].PRN = sv; + session->gpsdata.skyview[st].PRN = (short)sv; session->gpsdata.skyview[st].ss = (double)sn; for (j = 0; (int)j < session->driver.oncore.visible; j++) if (session->driver.oncore.PRN[j] == sv) { session->gpsdata.skyview[st].elevation = - session->driver.oncore.elevation[j]; + (short)session->driver.oncore.elevation[j]; session->gpsdata.skyview[st].azimuth = - session->driver.oncore.azimuth[j]; + (short)session->driver.oncore.azimuth[j]; Bbused |= 1 << j; break; } @@ -196,10 +199,11 @@ oncore_msg_navsol(struct gps_device_t *session, unsigned char *buf, for (j = 0; (int)j < session->driver.oncore.visible; j++) /*@ -boolops @*/ if (!(Bbused & (1 << j))) { - session->gpsdata.skyview[st].PRN = session->driver.oncore.PRN[j]; + session->gpsdata.skyview[st].PRN = (short)session->driver.oncore.PRN[j]; session->gpsdata.skyview[st].elevation = - session->driver.oncore.elevation[j]; - session->gpsdata.skyview[st].azimuth = session->driver.oncore.azimuth[j]; + (short)session->driver.oncore.elevation[j]; + session->gpsdata.skyview[st].azimuth = + (short)session->driver.oncore.azimuth[j]; st++; } /*@ +boolops @*/ @@ -310,9 +314,9 @@ oncore_msg_svinfo(struct gps_device_t *session, unsigned char *buf, session->driver.oncore.azimuth[i] = az; /* If it has an entry in the satellite list, update it! */ for (j = 0; j < session->gpsdata.satellites_visible; j++) - if (session->gpsdata.skyview[j].PRN == sv) { - session->gpsdata.skyview[j].elevation = el; - session->gpsdata.skyview[j].azimuth = az; + if (session->gpsdata.skyview[j].PRN == (short)sv) { + session->gpsdata.skyview[j].elevation = (short)el; + session->gpsdata.skyview[j].azimuth = (short)az; } } |