diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2011-03-27 10:57:51 -0400 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2011-03-27 10:57:51 -0400 |
| commit | d004b6a55f36506cbc5977d817bd4ce3c3903c6f (patch) | |
| tree | e8d5af24676888fd628887721ce6e3e0b6c98f5d /pseudonmea.c | |
| parent | 81670f70953c4f99730c51bd17fb0c8a65972fe1 (diff) | |
| download | gpsd-d004b6a55f36506cbc5977d817bd4ce3c3903c6f.tar.gz | |
Re-identify most *_IS flags with corresponding *_SET flags.
Required so clients looking at flag masks in data exported via the shared-memory
interface will see the right thing.
These were separated originally in order to avoid pushing the reqyuired width
of the gpsdata.set flag mask over 32 bits. It became 64 bits in the Version 5
API change, so that constraint went away.
All regression tests pass.
Diffstat (limited to 'pseudonmea.c')
| -rw-r--r-- | pseudonmea.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pseudonmea.c b/pseudonmea.c index 31b094e9..f84dc010 100644 --- a/pseudonmea.c +++ b/pseudonmea.c @@ -167,7 +167,7 @@ static void gpsd_binary_quality_dump(struct gps_device_t *session, char *bufp2 = bufp; bool used_valid = (session->gpsdata.set & USED_IS) != 0; - if (session->device_type != NULL && (session->gpsdata.set & MODE_IS) != 0) { + if (session->device_type != NULL && (session->gpsdata.set & MODE_SET) != 0) { (void)snprintf(bufp, len - strlen(bufp), "$GPGSA,%c,%d,", 'A', session->gpsdata.fix.mode); j = 0; @@ -281,17 +281,17 @@ void nmea_tpv_dump(struct gps_device_t *session, /*@out@*/ char bufp[], size_t len) { bufp[0] = '\0'; - if ((session->gpsdata.set & TIME_IS) != 0) + if ((session->gpsdata.set & TIME_SET) != 0) gpsd_binary_time_dump(session, bufp + strlen(bufp), len - strlen(bufp)); - if ((session->gpsdata.set & LATLON_IS) != 0) { + if ((session->gpsdata.set & LATLON_SET) != 0) { gpsd_position_fix_dump(session, bufp + strlen(bufp), len - strlen(bufp)); gpsd_transit_fix_dump(session, bufp + strlen(bufp), len - strlen(bufp)); } if ((session->gpsdata.set - & (MODE_IS | DOP_IS | USED_IS | HERR_IS | VERR_IS)) != 0) + & (MODE_SET | DOP_SET | USED_IS | HERR_SET | VERR_SET)) != 0) gpsd_binary_quality_dump(session, bufp + strlen(bufp), len - strlen(bufp)); } @@ -301,7 +301,7 @@ void nmea_sky_dump(struct gps_device_t *session, /*@out@*/ char bufp[], size_t len) { bufp[0] = '\0'; - if ((session->gpsdata.set & SATELLITE_IS) != 0) + if ((session->gpsdata.set & SATELLITE_SET) != 0) gpsd_binary_satellite_dump(session, bufp + strlen(bufp), len - strlen(bufp)); } @@ -310,7 +310,7 @@ void nmea_subframe_dump(struct gps_device_t *session, /*@out@*/ char bufp[], size_t len) { bufp[0] = '\0'; - if ((session->gpsdata.set & SUBFRAME_IS) != 0) + if ((session->gpsdata.set & SUBFRAME_SET) != 0) gpsd_binary_almanac_dump(session, bufp + strlen(bufp), len - strlen(bufp)); } |