From 0fcb2da0c5ae748c64c3c6f09f0dd8f7998f74f2 Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Sat, 10 Jan 2015 13:14:12 -0500 Subject: Almost entirely eliminate use of sats_used array. Instead, set the used member in the satellites array directly where possible. The NMEA0183 and TSIP drivers still need a local equivalent. This changes pseudo-NMEA GSA output in several binary-protocol tests. --- driver_tsip.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'driver_tsip.c') diff --git a/driver_tsip.c b/driver_tsip.c index 6b909c56..92c8effb 100644 --- a/driver_tsip.c +++ b/driver_tsip.c @@ -513,7 +513,7 @@ static gps_mask_t tsip_parse_input(struct gps_device_t *session) session->gpsdata.skyview[i].azimuth = (int)round(d2); session->gpsdata.skyview[i].used = false; for (j = 0; j < session->gpsdata.satellites_used; j++) - if (session->gpsdata.skyview[i].PRN && session->sats_used[j]) + if (session->gpsdata.skyview[i].PRN && session->driver.tsip.sats_used[j]) session->gpsdata.skyview[i].used = true; } else { session->gpsdata.skyview[i].PRN = @@ -574,12 +574,12 @@ static gps_mask_t tsip_parse_input(struct gps_device_t *session) pow(session->gpsdata.dop.tdop, 2)); /*@ +evalorder @*/ - memset(session->sats_used, 0, sizeof(session->sats_used)); + memset(session->driver.tsip.sats_used, 0, sizeof(session->driver.tsip.sats_used)); buf2[0] = '\0'; /*@ +charint @*/ for (i = 0; i < count; i++) (void)snprintf(buf2 + strlen(buf2), sizeof(buf2) - strlen(buf2), - " %d", session->sats_used[i] = + " %d", session->driver.tsip.sats_used[i] = (int)getub(buf, 17 + i)); /*@ -charint @*/ gpsd_report(&session->context->errout, LOG_DATA, -- cgit v1.2.1