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 /driver_geostar.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 'driver_geostar.c')
| -rw-r--r-- | driver_geostar.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/driver_geostar.c b/driver_geostar.c index f6738ffb..738e75aa 100644 --- a/driver_geostar.c +++ b/driver_geostar.c @@ -204,14 +204,14 @@ static gps_mask_t geostar_analyze(struct gps_device_t *session) if (ul1 != 0) { session->gpsdata.status = STATUS_NO_FIX; - mask |= STATUS_IS; + mask |= STATUS_SET; } else { if (session->gpsdata.status < STATUS_FIX) { session->gpsdata.status = STATUS_FIX; - mask |= STATUS_IS; + mask |= STATUS_SET; } } - mask |= TIME_IS | PPSTIME_IS | LATLON_IS | ALTITUDE_IS | SPEED_IS | TRACK_IS | DOP_IS | USED_IS | REPORT_IS; + mask |= TIME_SET | PPSTIME_IS | LATLON_SET | ALTITUDE_SET | SPEED_SET | TRACK_SET | DOP_SET | USED_IS | REPORT_IS; gpsd_report(LOG_INF, "Geographic coordinates %f %g %g %g %g %g\n", d1, @@ -247,7 +247,7 @@ static gps_mask_t geostar_analyze(struct gps_device_t *session) session->newdata.mode = MODE_NO_FIX; } - mask |= MODE_IS | STATUS_IS; + mask |= MODE_SET | STATUS_SET; break; case 0x22: ul1 = getleu32(buf, OFFSET(1)); @@ -270,7 +270,7 @@ static gps_mask_t geostar_analyze(struct gps_device_t *session) } } session->gpsdata.skyview_time = NAN; - mask |= SATELLITE_IS | USED_IS; + mask |= SATELLITE_SET | USED_IS; break; case 0x3e: ul1 = getleu32(buf, OFFSET(1)); @@ -414,7 +414,7 @@ static gps_mask_t geostar_analyze(struct gps_device_t *session) /*@ +formattype @*/ gpsd_report(LOG_INF, "Response to Request FW version command: %s\n", session->subtype); - mask |= DEVICEID_IS; + mask |= DEVICEID_SET; break; case 0xc2: gpsd_report(LOG_INF, "Response to Restart receiver command\n"); |