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_garmin.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_garmin.c')
| -rw-r--r-- | driver_garmin.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/driver_garmin.c b/driver_garmin.c index d2bf60f9..2acc8e55 100644 --- a/driver_garmin.c +++ b/driver_garmin.c @@ -356,9 +356,9 @@ gps_mask_t PrintSERPacket(struct gps_device_t *session, unsigned char pkt_id, gpsd_report(LOG_INF, "Garmin: Product ID: %d, SoftVer: %d.%02d\n", prod_id, maj_ver, min_ver); gpsd_report(LOG_INF, "Garmin: Product Desc: %s\n", &buf[4]); - mask |= DEVICEID_IS; + mask |= DEVICEID_SET; gpsd_report(LOG_DATA, "Garmin: PRODUCT_DATA: subtype=%s mask=%s\n", - session->subtype, gpsd_maskdump(mask)); + session->subtype, gps_maskdump(mask)); break; case GARMIN_PKTID_PVT_DATA: gpsd_report(LOG_PROG, "Garmin: Appl, PVT Data Sz: %d\n", pkt_len); @@ -478,8 +478,8 @@ gps_mask_t PrintSERPacket(struct gps_device_t *session, unsigned char pkt_id, if (session->newdata.mode > MODE_NO_FIX) { /* data only valid with a fix */ mask |= - TIME_IS | LATLON_IS | ALTITUDE_IS | STATUS_IS | MODE_IS | - SPEED_IS | TRACK_IS | CLIMB_IS | HERR_IS | VERR_IS | PERR_IS | + TIME_SET | LATLON_SET | ALTITUDE_SET | STATUS_SET | MODE_SET | + SPEED_SET | TRACK_SET | CLIMB_SET | HERR_SET | VERR_SET | PERR_IS | CLEAR_IS | REPORT_IS; /* * Garmin documentation says we should wait until four good fixes @@ -504,7 +504,7 @@ gps_mask_t PrintSERPacket(struct gps_device_t *session, unsigned char pkt_id, session->newdata.epy, session->newdata.epv, session->newdata.mode, - session->gpsdata.status, gpsd_maskdump(mask)); + session->gpsdata.status, gps_maskdump(mask)); break; case GARMIN_PKTID_RMD_DATA: case GARMIN_PKTID_RMD41_DATA: @@ -568,11 +568,11 @@ gps_mask_t PrintSERPacket(struct gps_device_t *session, unsigned char pkt_id, } session->gpsdata.skyview_time = NAN; - mask |= SATELLITE_IS | USED_IS; + mask |= SATELLITE_SET | USED_IS; gpsd_report(LOG_DATA, "Garmin: SAT_DATA: visible=%d used=%d mask=%s\n", session->gpsdata.satellites_visible, - session->gpsdata.satellites_used, gpsd_maskdump(mask)); + session->gpsdata.satellites_used, gps_maskdump(mask)); break; case GARMIN_PKTID_PROTOCOL_ARRAY: // this packet is never requested, it just comes, in some case @@ -593,7 +593,7 @@ gps_mask_t PrintSERPacket(struct gps_device_t *session, unsigned char pkt_id, break; } gpsd_report(LOG_IO, "Garmin: PrintSERPacket(, %#02x, %#02x, ) = %s\n", - pkt_id, pkt_len, gpsd_maskdump(mask)); + pkt_id, pkt_len, gps_maskdump(mask)); return mask; } @@ -1123,7 +1123,7 @@ gps_mask_t garmin_ser_parse(struct gps_device_t *session) Send_ACK(); /*@ +usedef +compdef @*/ gpsd_report(LOG_IO, "Garmin: garmin_ser_parse( ) = %s\n", - gpsd_maskdump(mask)); + gps_maskdump(mask)); return mask; } |