diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2015-01-10 13:14:12 -0500 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2015-01-10 13:14:12 -0500 |
| commit | 0fcb2da0c5ae748c64c3c6f09f0dd8f7998f74f2 (patch) | |
| tree | 0d0a35034245df150af29ac58c100723079fd1cc /driver_zodiac.c | |
| parent | a950067545c52db618154994f76a5659d1be558c (diff) | |
| download | gpsd-0fcb2da0c5ae748c64c3c6f09f0dd8f7998f74f2.tar.gz | |
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.
Diffstat (limited to 'driver_zodiac.c')
| -rw-r--r-- | driver_zodiac.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/driver_zodiac.c b/driver_zodiac.c index 6ff24efe..e23ef7b2 100644 --- a/driver_zodiac.c +++ b/driver_zodiac.c @@ -216,7 +216,7 @@ static gps_mask_t handle1000(struct gps_device_t *session) static gps_mask_t handle1002(struct gps_device_t *session) /* satellite signal quality report */ { - int i, j; + int i; /* ticks = getzlong(6); */ /* sequence = getzword(8); */ @@ -229,7 +229,6 @@ static gps_mask_t handle1002(struct gps_device_t *session) /* Note: this week counter is not limited to 10 bits. */ session->context->gps_week = (unsigned short)gps_week; session->gpsdata.satellites_used = 0; - memset(session->sats_used, 0, sizeof(session->sats_used)); for (i = 0; i < ZODIAC_CHANNELS; i++) { int status, prn; /*@ -type @*/ @@ -238,13 +237,11 @@ static gps_mask_t handle1002(struct gps_device_t *session) /*@ +type @*/ if (status & 1) - session->sats_used[session->gpsdata.satellites_used++] = prn; - for (j = 0; j < ZODIAC_CHANNELS; j++) { - if (session->gpsdata.skyview[j].PRN != prn) - continue; - session->gpsdata.skyview[j].ss = (float)getzword(17 + (3 * i)); - break; - } + session->gpsdata.satellites_used++; + + session->gpsdata.skyview[i].PRN = prn; + session->gpsdata.skyview[i].ss = (float)getzword(17 + (3 * i)); + session->gpsdata.skyview[i].used = (bool)(status & 1); } session->gpsdata.skyview_time = gpsd_gpstime_resolve(session, (unsigned short)gps_week, |