diff options
author | Gary E. Miller <gem@rellim.com> | 2018-10-24 15:32:24 -0700 |
---|---|---|
committer | Gary E. Miller <gem@rellim.com> | 2018-10-24 15:32:24 -0700 |
commit | f1344151085131de7765ce37c9e5dab40c43e56d (patch) | |
tree | 29c134b34037b056b9e2f7b5ef54fcecd8f9f227 /driver_evermore.c | |
parent | ec0243f268e8c44be5b3b1356059c42ae4a4bc80 (diff) | |
download | gpsd-f1344151085131de7765ce37c9e5dab40c43e56d.tar.gz |
rawdata_t: Change data structure.
The rawdata_t structure was written into, but never read from. So
a change to it is low impact. Reorder it to simplify pointer
arithmetic. In preparation for more changes.
Diffstat (limited to 'driver_evermore.c')
-rw-r--r-- | driver_evermore.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/driver_evermore.c b/driver_evermore.c index 0566f567..51c4d603 100644 --- a/driver_evermore.c +++ b/driver_evermore.c @@ -336,16 +336,20 @@ gps_mask_t evermore_parse(struct gps_device_t * session, unsigned char *buf, int prn = (int)UBITS(k, 4, 5); /* this is so we can tell which never got set */ for (j = 0; j < MAXCHANNELS; j++) - session->gpsdata.raw.mtime[j] = 0; + session->gpsdata.raw[j].mtime = 0; for (j = 0; j < MAXCHANNELS; j++) { if (session->gpsdata.PRN[j] == prn) { - session->gpsdata.raw.codephase[j] = NAN; - session->gpsdata.raw.carrierphase[j] = NAN; - session->gpsdata.raw.mtime[j] = session->newdata.time; - session->gpsdata.raw.satstat[j] = (unsigned)UBITS(k, 24, 8); - session->gpsdata.raw.pseudorange[j] = (double)SBITS(k,40,32); - session->gpsdata.raw.deltarange[j] = (double)SBITS(k,72,32); - session->gpsdata.raw.doppler[j] = (double)SBITS(k, 104, 16); + session->gpsdata.raw[j].codephase = NAN; + session->gpsdata.raw[j].carrierphase = NAN; + session->gpsdata.raw[j].mtime = session->newdata.time; + session->gpsdata.raw[j].satstat = \ + (unsigned)UBITS(k, 24, 8); + session->gpsdata.raw[j].pseudorange = \ + (double)SBITS(k,40,32); + session->gpsdata.raw[j].deltarange = \ + (double)SBITS(k,72,32); + session->gpsdata.raw[j].doppler = \ + (double)SBITS(k, 104, 16); } } } |