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_zodiac.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_zodiac.c')
| -rw-r--r-- | driver_zodiac.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/driver_zodiac.c b/driver_zodiac.c index c76e0b00..ef763759 100644 --- a/driver_zodiac.c +++ b/driver_zodiac.c @@ -201,15 +201,15 @@ static gps_mask_t handle1000(struct gps_device_t *session) /* clock_drift_sd = (int)getzlong(53) * 1e-2; */ mask = - TIME_IS | PPSTIME_IS | LATLON_IS | ALTITUDE_IS | CLIMB_IS | SPEED_IS | - TRACK_IS | STATUS_IS | MODE_IS; + TIME_SET | PPSTIME_IS | LATLON_SET | ALTITUDE_SET | CLIMB_SET | SPEED_SET | + TRACK_SET | STATUS_SET | MODE_SET; gpsd_report(LOG_DATA, "1000: time=%.2f lat=%.2f lon=%.2f alt=%.2f track=%.2f speed=%.2f climb=%.2f mode=%d status=%d mask=%s\n", session->newdata.time, session->newdata.latitude, session->newdata.longitude, session->newdata.altitude, session->newdata.track, session->newdata.speed, session->newdata.climb, session->newdata.mode, - session->gpsdata.status, gpsd_maskdump(mask)); + session->gpsdata.status, gps_maskdump(mask)); return mask; } @@ -251,7 +251,7 @@ static gps_mask_t handle1002(struct gps_device_t *session) gpsd_report(LOG_DATA, "1002: visible=%d used=%d mask={SATELLITE|USED}\n", session->gpsdata.satellites_visible, session->gpsdata.satellites_used); - return SATELLITE_IS | USED_IS; + return SATELLITE_SET | USED_IS; } static gps_mask_t handle1003(struct gps_device_t *session) @@ -300,7 +300,7 @@ static gps_mask_t handle1003(struct gps_device_t *session) session->gpsdata.dop.hdop, session->gpsdata.dop.vdop, session->gpsdata.dop.pdop, session->gpsdata.dop.tdop); - return SATELLITE_IS | DOP_IS; + return SATELLITE_SET | DOP_SET; } static void handle1005(struct gps_device_t *session UNUSED) @@ -329,7 +329,7 @@ static gps_mask_t handle1011(struct gps_device_t *session) getstringz(session->subtype, session->packet.outbuffer, 19, 28); /* software version field */ gpsd_report(LOG_DATA, "1011: subtype=%s mask={DEVICEID}\n", session->subtype); - return DEVICEID_IS; + return DEVICEID_SET; } |