summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--driver_evermore.c4
-rw-r--r--driver_garmin.c19
-rw-r--r--driver_garmin_txt.c4
-rw-r--r--driver_italk.c5
-rw-r--r--driver_nmea.c33
-rw-r--r--driver_oncore.c4
-rw-r--r--driver_proto.c5
-rw-r--r--driver_sirf.c14
-rw-r--r--driver_superstar2.c4
-rw-r--r--driver_tsip.c38
-rw-r--r--driver_ubx.c4
-rw-r--r--driver_zodiac.c4
-rw-r--r--gpsctl.c7
-rw-r--r--gpsd.c23
-rw-r--r--gpsmon.c6
-rw-r--r--libgpsd_core.c2
16 files changed, 89 insertions, 87 deletions
diff --git a/driver_evermore.c b/driver_evermore.c
index 729583ff..17fe6317 100644
--- a/driver_evermore.c
+++ b/driver_evermore.c
@@ -216,12 +216,12 @@ gps_mask_t evermore_parse(struct gps_device_t * session, unsigned char *buf,
mask |= DEVICEID_SET;
}
gpsd_report(LOG_DATA,
- "NDO 0x02: time=%.2f, lat=%.2f lon=%.2f alt=%.2f speed=%.2f track=%.2f climb=%.2f mode=%d subtype='%s' mask=%s\n",
+ "NDO 0x02: time=%.2f, lat=%.2f lon=%.2f alt=%.2f speed=%.2f track=%.2f climb=%.2f mode=%d subtype='%s\n",
session->newdata.time, session->newdata.latitude,
session->newdata.longitude, session->newdata.altitude,
session->newdata.speed, session->newdata.track,
session->newdata.climb, session->newdata.mode,
- session->gpsdata.dev.subtype, gps_maskdump(mask));
+ session->gpsdata.dev.subtype);
return mask | CLEAR_IS | REPORT_IS;
case 0x04: /* DOP Data Output */
diff --git a/driver_garmin.c b/driver_garmin.c
index f784e853..2b43ae41 100644
--- a/driver_garmin.c
+++ b/driver_garmin.c
@@ -357,8 +357,8 @@ gps_mask_t PrintSERPacket(struct gps_device_t *session, unsigned char pkt_id,
prod_id, maj_ver, min_ver);
gpsd_report(LOG_INF, "Garmin: Product Desc: %s\n", &buf[4]);
mask |= DEVICEID_SET;
- gpsd_report(LOG_DATA, "Garmin: PRODUCT_DATA: subtype=%s mask=%s\n",
- session->subtype, gps_maskdump(mask));
+ gpsd_report(LOG_DATA, "Garmin: PRODUCT_DATA: subtype=%s\n",
+ session->subtype);
break;
case GARMIN_PKTID_PVT_DATA:
gpsd_report(LOG_PROG, "Garmin: Appl, PVT Data Sz: %d\n", pkt_len);
@@ -493,7 +493,7 @@ gps_mask_t PrintSERPacket(struct gps_device_t *session, unsigned char pkt_id,
"Garmin: PVT_DATA: time=%.2f, lat=%.2f lon=%.2f "
"speed=%.2f track=%.2f climb=%.2f "
"epx=%.2f epy=%.2f epv=%.2f "
- "mode=%d status=%d mask=%s\n",
+ "mode=%d status=%d\n",
session->newdata.time,
session->newdata.latitude,
session->newdata.longitude,
@@ -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, gps_maskdump(mask));
+ session->gpsdata.status);
break;
case GARMIN_PKTID_RMD_DATA:
case GARMIN_PKTID_RMD41_DATA:
@@ -570,9 +570,9 @@ gps_mask_t PrintSERPacket(struct gps_device_t *session, unsigned char pkt_id,
session->gpsdata.skyview_time = NAN;
mask |= SATELLITE_SET | USED_IS;
gpsd_report(LOG_DATA,
- "Garmin: SAT_DATA: visible=%d used=%d mask=%s\n",
+ "Garmin: SAT_DATA: visible=%d used=%d\n",
session->gpsdata.satellites_visible,
- session->gpsdata.satellites_used, gps_maskdump(mask));
+ session->gpsdata.satellites_used);
break;
case GARMIN_PKTID_PROTOCOL_ARRAY:
// this packet is never requested, it just comes, in some case
@@ -592,8 +592,8 @@ gps_mask_t PrintSERPacket(struct gps_device_t *session, unsigned char pkt_id,
LOG_WARN));
break;
}
- gpsd_report(LOG_IO, "Garmin: PrintSERPacket(, %#02x, %#02x, ) = %s\n",
- pkt_id, pkt_len, gps_maskdump(mask));
+ gpsd_report(LOG_IO, "Garmin: PrintSERPacket(, %#02x, %#02x, )\n",
+ pkt_id, pkt_len);
return mask;
}
@@ -1124,8 +1124,7 @@ gps_mask_t garmin_ser_parse(struct gps_device_t *session)
(void)usleep(300);
Send_ACK();
/*@ +usedef +compdef @*/
- gpsd_report(LOG_IO, "Garmin: garmin_ser_parse( ) = %s\n",
- gps_maskdump(mask));
+ gpsd_report(LOG_IO, "Garmin: garmin_ser_parse( )\n");
return mask;
}
diff --git a/driver_garmin_txt.c b/driver_garmin_txt.c
index c67a39b3..d53dd57e 100644
--- a/driver_garmin_txt.c
+++ b/driver_garmin_txt.c
@@ -444,13 +444,13 @@ gps_mask_t garmintxt_parse(struct gps_device_t * session)
} while (0);
gpsd_report(LOG_DATA,
- "GTXT: time=%.2f, lat=%.2f lon=%.2f alt=%.2f speed=%.2f track=%.2f climb=%.2f exp=%.2f epy=%.2f mode=%d status=%d mask=%s\n",
+ "GTXT: time=%.2f, lat=%.2f lon=%.2f alt=%.2f speed=%.2f track=%.2f climb=%.2f exp=%.2f epy=%.2f mode=%d status=%d\n",
session->newdata.time, session->newdata.latitude,
session->newdata.longitude, session->newdata.altitude,
session->newdata.speed, session->newdata.track,
session->newdata.climb, session->newdata.epx,
session->newdata.epy, session->newdata.mode,
- session->gpsdata.status, gps_maskdump(mask));
+ session->gpsdata.status);
return mask;
}
diff --git a/driver_italk.c b/driver_italk.c
index 406cdaaf..6dbe15d6 100644
--- a/driver_italk.c
+++ b/driver_italk.c
@@ -107,15 +107,14 @@ static gps_mask_t decode_itk_navfix(struct gps_device_t *session,
}
gpsd_report(LOG_DATA,
- "NAV_FIX: time=%.2f, lat=%.2f lon=%.2f alt=%.f speed=%.2f track=%.2f climb=%.2f mode=%d status=%d gdop=%.2f pdop=%.2f hdop=%.2f vdop=%.2f tdop=%.2f mask=%s\n",
+ "NAV_FIX: time=%.2f, lat=%.2f lon=%.2f alt=%.f speed=%.2f track=%.2f climb=%.2f mode=%d status=%d gdop=%.2f pdop=%.2f hdop=%.2f vdop=%.2f tdop=%.2f\n",
session->newdata.time, session->newdata.latitude,
session->newdata.longitude, session->newdata.altitude,
session->newdata.speed, session->newdata.track,
session->newdata.climb, session->newdata.mode,
session->gpsdata.status, session->gpsdata.dop.gdop,
session->gpsdata.dop.pdop, session->gpsdata.dop.hdop,
- session->gpsdata.dop.vdop, session->gpsdata.dop.tdop,
- gps_maskdump(mask));
+ session->gpsdata.dop.vdop, session->gpsdata.dop.tdop);
return mask;
}
diff --git a/driver_nmea.c b/driver_nmea.c
index 1ed293fc..adc139ea 100644
--- a/driver_nmea.c
+++ b/driver_nmea.c
@@ -208,14 +208,14 @@ static gps_mask_t processGPRMC(int count, char *field[],
gpsd_report(LOG_DATA,
"RMC: ddmmyy=%s hhmmss=%s lat=%.2f lon=%.2f "
- "speed=%.2f track=%.2f mode=%d status=%d mask=%s\n",
+ "speed=%.2f track=%.2f mode=%d status=%d\n",
field[9], field[1],
session->newdata.latitude,
session->newdata.longitude,
session->newdata.speed,
session->newdata.track,
session->newdata.mode,
- session->gpsdata.status, gps_maskdump(mask));
+ session->gpsdata.status);
return mask;
}
@@ -293,12 +293,12 @@ static gps_mask_t processGPGLL(int count, char *field[],
}
gpsd_report(LOG_DATA,
- "GLL: hhmmss=%s lat=%.2f lon=%.2f mode=%d status=%d mask=%s\n",
+ "GLL: hhmmss=%s lat=%.2f lon=%.2f mode=%d status=%d\n",
field[5],
session->newdata.latitude,
session->newdata.longitude,
session->newdata.mode,
- session->gpsdata.status, gps_maskdump(mask));
+ session->gpsdata.status);
return mask;
}
@@ -396,13 +396,13 @@ static gps_mask_t processGPGGA(int c UNUSED, char *field[],
}
}
gpsd_report(LOG_DATA,
- "GGA: hhmmss=%s lat=%.2f lon=%.2f alt=%.2f mode=%d status=%d mask=%s\n",
+ "GGA: hhmmss=%s lat=%.2f lon=%.2f alt=%.2f mode=%d status=%d\n",
field[1],
session->newdata.latitude,
session->newdata.longitude,
session->newdata.altitude,
session->newdata.mode,
- session->gpsdata.status, gps_maskdump(mask));
+ session->gpsdata.status);
return mask;
}
@@ -511,12 +511,12 @@ static gps_mask_t processGPGSA(int count, char *field[],
}
mask |= DOP_SET | USED_IS;
gpsd_report(LOG_DATA,
- "GPGSA: mode=%d used=%d pdop=%.2f hdop=%.2f vdop=%.2f mask=%s\n",
+ "GPGSA: mode=%d used=%d pdop=%.2f hdop=%.2f vdop=%.2f\n",
session->newdata.mode,
session->gpsdata.satellites_used,
session->gpsdata.dop.pdop,
session->gpsdata.dop.hdop,
- session->gpsdata.dop.vdop, gps_maskdump(mask));
+ session->gpsdata.dop.vdop);
}
return mask;
}
@@ -655,10 +655,10 @@ static gps_mask_t processPGRME(int c UNUSED, char *field[],
mask = HERR_SET | VERR_SET | PERR_IS;
}
- gpsd_report(LOG_DATA, "PGRME: epx=%.2f epy=%.2f epv=%.2f mask=%s\n",
+ gpsd_report(LOG_DATA, "PGRME: epx=%.2f epy=%.2f epv=%.2f\n",
session->newdata.epx,
session->newdata.epy,
- session->newdata.epv, gps_maskdump(mask));
+ session->newdata.epv);
return mask;
}
@@ -689,10 +689,10 @@ static gps_mask_t processGPGBS(int c UNUSED, char *field[],
session->newdata.epy = atof(field[2]);
session->newdata.epx = atof(field[3]);
session->newdata.epv = atof(field[4]);
- gpsd_report(LOG_DATA, "GBS: epx=%.2f epy=%.2f epv=%.2f mask=%s\n",
+ gpsd_report(LOG_DATA, "GBS: epx=%.2f epy=%.2f epv=%.2f\n",
session->newdata.epx,
session->newdata.epy,
- session->newdata.epv, gps_maskdump(HERR_SET | VERR_SET));
+ session->newdata.epv);
return HERR_SET | VERR_SET;
} else {
gpsd_report(LOG_PROG,
@@ -768,7 +768,6 @@ static gps_mask_t processGPZDA(int c UNUSED, char *field[],
mask = TIME_SET;
}
};
- gpsd_report(LOG_DATA, "ZDA: mask=%s\n", gps_maskdump(mask));
return mask;
}
@@ -936,14 +935,14 @@ static gps_mask_t processPASHR(int c UNUSED, char *field[],
mask |= (SPEED_SET | TRACK_SET | CLIMB_SET);
mask |= DOP_SET;
gpsd_report(LOG_DATA,
- "PASHR,POS: hhmmss=%s lat=%.2f lon=%.2f alt=%.f speed=%.2f track=%.2f climb=%.2f mode=%d status=%d pdop=%.2f hdop=%.2f vdop=%.2f tdop=%.2f mask=%s\n",
+ "PASHR,POS: hhmmss=%s lat=%.2f lon=%.2f alt=%.f speed=%.2f track=%.2f climb=%.2f mode=%d status=%d pdop=%.2f hdop=%.2f vdop=%.2f tdop=%.2f\n",
field[4], session->newdata.latitude,
session->newdata.longitude, session->newdata.altitude,
session->newdata.speed, session->newdata.track,
session->newdata.climb, session->newdata.mode,
session->gpsdata.status, session->gpsdata.dop.pdop,
session->gpsdata.dop.hdop, session->gpsdata.dop.vdop,
- session->gpsdata.dop.tdop, gps_maskdump(mask));
+ session->gpsdata.dop.tdop);
}
} else if (0 == strcmp("SAT", field[1])) { /* Satellite Status */
int i, n, p, u;
@@ -958,8 +957,8 @@ static gps_mask_t processPASHR(int c UNUSED, char *field[],
session->gpsdata.used[u++] = p;
}
session->gpsdata.satellites_used = u;
- gpsd_report(LOG_DATA, "PASHR,SAT: used=%d mask=%s\n",
- session->gpsdata.satellites_used, gps_maskdump(mask));
+ gpsd_report(LOG_DATA, "PASHR,SAT: used=%d\n",
+ session->gpsdata.satellites_used);
session->gpsdata.skyview_time = NAN;
mask |= SATELLITE_SET | USED_IS;
}
diff --git a/driver_oncore.c b/driver_oncore.c
index a90665cf..74728d60 100644
--- a/driver_oncore.c
+++ b/driver_oncore.c
@@ -214,13 +214,13 @@ oncore_msg_navsol(struct gps_device_t *session, unsigned char *buf,
(void)oncore_control_send(session, (char *)pollEn, sizeof(pollEn));
gpsd_report(LOG_DATA,
- "NAVSOL: time=%.2f lat=%.2f lon=%.2f alt=%.2f speed=%.2f track=%.2f mode=%d status=%d visible=%d used=%d mask=%s\n",
+ "NAVSOL: time=%.2f lat=%.2f lon=%.2f alt=%.2f speed=%.2f track=%.2f mode=%d status=%d visible=%d used=%d\n",
session->newdata.time, session->newdata.latitude,
session->newdata.longitude, session->newdata.altitude,
session->newdata.speed, session->newdata.track,
session->newdata.mode, session->gpsdata.status,
session->gpsdata.satellites_used,
- session->gpsdata.satellites_visible, gps_maskdump(mask));
+ session->gpsdata.satellites_visible);
return mask;
}
diff --git a/driver_proto.c b/driver_proto.c
index 3f298a3b..6918cd58 100644
--- a/driver_proto.c
+++ b/driver_proto.c
@@ -120,14 +120,13 @@ _proto__msg_navsol(struct gps_device_t *session, unsigned char *buf, size_t data
* the fields it potentially set and the transfer mask. Doing this
* makes it relatively easy to track down data-management problems.
*/
- gpsd_report(LOG_DATA, "NAVSOL: time=%.2f, lat=%.2f lon=%.2f alt=%.2f mode=%d status=%d mask=%s\n",
+ gpsd_report(LOG_DATA, "NAVSOL: time=%.2f, lat=%.2f lon=%.2f alt=%.2f mode=%d status=%d\n",
session->newdata.time,
session->newdata.latitude,
session->newdata.longitude,
session->newdata.altitude,
session->newdata.mode,
- session->gpsdata.status,
- gps_maskdump(mask));
+ session->gpsdata.status);
return mask;
}
diff --git a/driver_sirf.c b/driver_sirf.c
index 164a367d..0ca5a25c 100644
--- a/driver_sirf.c
+++ b/driver_sirf.c
@@ -653,13 +653,12 @@ static gps_mask_t sirf_msg_navsol(struct gps_device_t *session,
mask |= PPSTIME_IS;
}
gpsd_report(LOG_DATA,
- "SiRF: MND 0x02: time=%.2f lat=%.2f lon=%.2f alt=%.2f track=%.2f speed=%.2f mode=%d status=%d hdop=%.2f used=%d mask=%s\n",
+ "SiRF: MND 0x02: time=%.2f lat=%.2f lon=%.2f alt=%.2f track=%.2f speed=%.2f mode=%d status=%d hdop=%.2f used=%d\n",
session->newdata.time, session->newdata.latitude,
session->newdata.longitude, session->newdata.altitude,
session->newdata.track, session->newdata.speed,
session->newdata.mode, session->gpsdata.status,
- session->gpsdata.dop.hdop, session->gpsdata.satellites_used,
- gps_maskdump(mask));
+ session->gpsdata.dop.hdop, session->gpsdata.satellites_used);
return mask;
}
@@ -812,7 +811,7 @@ static gps_mask_t sirf_msg_geodetic(struct gps_device_t *session,
mask |= ALTITUDE_SET | CLIMB_SET;
}
gpsd_report(LOG_DATA,
- "SiRF: GND 0x29: time=%.2f lat=%.2f lon=%.2f alt=%.2f track=%.2f speed=%.2f mode=%d status=%d mask=%s\n",
+ "SiRF: GND 0x29: time=%.2f lat=%.2f lon=%.2f alt=%.2f track=%.2f speed=%.2f mode=%d status=%d\n",
session->newdata.time,
session->newdata.latitude,
session->newdata.longitude,
@@ -820,7 +819,7 @@ static gps_mask_t sirf_msg_geodetic(struct gps_device_t *session,
session->newdata.track,
session->newdata.speed,
session->newdata.mode,
- session->gpsdata.status, gps_maskdump(mask));
+ session->gpsdata.status);
return mask;
}
#endif /* __UNUSED__ */
@@ -924,15 +923,14 @@ static gps_mask_t sirf_msg_ublox(struct gps_device_t *session,
session->gpsdata.dop.tdop = (int)getub(buf, 38) / 5.0;
session->driver.sirf.driverstate |= UBLOX;
gpsd_report(LOG_DATA,
- "SiRF: EMD 0x62: time=%.2f lat=%.2f lon=%.2f alt=%.f speed=%.2f track=%.2f climb=%.2f mode=%d status=%d gdop=%.2f pdop=%.2f hdop=%.2f vdop=%.2f tdop=%.2f mask=%s\n",
+ "SiRF: EMD 0x62: time=%.2f lat=%.2f lon=%.2f alt=%.f speed=%.2f track=%.2f climb=%.2f mode=%d status=%d gdop=%.2f pdop=%.2f hdop=%.2f vdop=%.2f tdop=%.2f\n",
session->newdata.time, session->newdata.latitude,
session->newdata.longitude, session->newdata.altitude,
session->newdata.speed, session->newdata.track,
session->newdata.climb, session->newdata.mode,
session->gpsdata.status, session->gpsdata.dop.gdop,
session->gpsdata.dop.pdop, session->gpsdata.dop.hdop,
- session->gpsdata.dop.vdop, session->gpsdata.dop.tdop,
- gps_maskdump(mask));
+ session->gpsdata.dop.vdop, session->gpsdata.dop.tdop);
return mask;
}
diff --git a/driver_superstar2.c b/driver_superstar2.c
index 37c3d4aa..34b54ff6 100644
--- a/driver_superstar2.c
+++ b/driver_superstar2.c
@@ -142,7 +142,7 @@ superstar2_msg_navsol_lla(struct gps_device_t *session,
mask |= MODE_SET | STATUS_SET;
gpsd_report(LOG_DATA,
- "NAVSOL_LLA: time=%.2f lat=%.2f lon=%.2f alt=%.2f track=%.2f speed=%.2f climb=%.2f mode=%d status=%d hdop=%.2f hdop=%.2f used=%d mask=%s\n",
+ "NAVSOL_LLA: time=%.2f lat=%.2f lon=%.2f alt=%.2f track=%.2f speed=%.2f climb=%.2f mode=%d status=%d hdop=%.2f hdop=%.2f used=%d\n",
session->newdata.time,
session->newdata.latitude,
session->newdata.longitude,
@@ -154,7 +154,7 @@ superstar2_msg_navsol_lla(struct gps_device_t *session,
session->gpsdata.status,
session->gpsdata.dop.hdop,
session->gpsdata.dop.vdop,
- session->gpsdata.satellites_used, gps_maskdump(mask));
+ session->gpsdata.satellites_used);
return mask;
}
diff --git a/driver_tsip.c b/driver_tsip.c
index 93e880ad..484fdd9d 100644
--- a/driver_tsip.c
+++ b/driver_tsip.c
@@ -298,11 +298,11 @@ static gps_mask_t tsip_analyze(struct gps_device_t *session)
}
mask |= LATLON_SET | ALTITUDE_SET | CLEAR_IS | REPORT_IS;
gpsd_report(LOG_DATA, "SPPLLA 0x4a "
- "time=%.2f lat=%.2f lon=%.2f alt=%.2f mask=%s\n",
+ "time=%.2f lat=%.2f lon=%.2f alt=%.2f\n",
session->newdata.time,
session->newdata.latitude,
session->newdata.longitude,
- session->newdata.altitude, gps_maskdump(mask));
+ session->newdata.altitude);
break;
case 0x4b: /* Machine/Code ID and Additional Status */
if (len != 3)
@@ -371,11 +371,11 @@ static gps_mask_t tsip_analyze(struct gps_device_t *session)
f4, f5);
mask |= SPEED_SET | TRACK_SET | CLIMB_SET;
gpsd_report(LOG_DATA, "VFENU 0x56 "
- "time=%.2f speed=%.2f track=%.2f climb=%.2f mask=%s\n",
+ "time=%.2f speed=%.2f track=%.2f climb=%.2f\n",
session->newdata.time,
session->newdata.speed,
session->newdata.track,
- session->newdata.climb, gps_maskdump(mask));
+ session->newdata.climb);
break;
case 0x57: /* Information About Last Computed Fix */
if (len != 8)
@@ -494,15 +494,14 @@ static gps_mask_t tsip_analyze(struct gps_device_t *session)
/*@ -charint @*/
gpsd_report(LOG_DATA, "AIVSS: 0x6d "
"status=%d used=%d "
- "pdop=%.1f hdop=%.1f vdop=%.1f tdop=%.1f gdup=%.1f "
- "mask=%s\n",
+ "pdop=%.1f hdop=%.1f vdop=%.1f tdop=%.1f gdup=%.1f\n",
session->gpsdata.status,
session->gpsdata.satellites_used,
session->gpsdata.dop.pdop,
session->gpsdata.dop.hdop,
session->gpsdata.dop.vdop,
session->gpsdata.dop.tdop,
- session->gpsdata.dop.gdop, gps_maskdump(mask));
+ session->gpsdata.dop.gdop);
mask |= DOP_SET | STATUS_SET | USED_IS;
break;
case 0x6e: /* Synchronized Measurements */
@@ -531,8 +530,7 @@ static gps_mask_t tsip_analyze(struct gps_device_t *session)
mask |= STATUS_SET;
}
/*@ -charint @*/
- gpsd_report(LOG_DATA, "DPFM 0x82 status=%d mask=%s\n",
- session->gpsdata.status, gps_maskdump(mask));
+ gpsd_report(LOG_DATA, "DPFM 0x82 status=%d\n", session->gpsdata.status);
break;
case 0x83: /* Double-Precision XYZ Position Fix and Bias Information */
if (len != 36)
@@ -566,11 +564,11 @@ static gps_mask_t tsip_analyze(struct gps_device_t *session)
session->newdata.longitude, session->newdata.altitude);
mask |= LATLON_SET | ALTITUDE_SET | CLEAR_IS | REPORT_IS;
gpsd_report(LOG_DATA, "DPPLLA 0x84 "
- "time=%.2f lat=%.2f lon=%.2f alt=%.2f mask=%s\n",
+ "time=%.2f lat=%.2f lon=%.2f alt=%.2f\n",
session->newdata.time,
session->newdata.latitude,
session->newdata.longitude,
- session->newdata.altitude, gps_maskdump(mask));
+ session->newdata.altitude);
break;
case 0x8f: /* Super Packet. Well... */
/*@ +charint @*/
@@ -661,12 +659,12 @@ static gps_mask_t tsip_analyze(struct gps_device_t *session)
gpsd_report(LOG_DATA,
"SP-LFEI 0x20: time=%.2f lat=%.2f lon=%.2f alt=%.2f "
"speed=%.2f track=%.2f climb=%.2f "
- "mode=%d status=%d mask=%s\n", session->newdata.time,
+ "mode=%d status=%d\n",
+ session->newdata.time,
session->newdata.latitude, session->newdata.longitude,
session->newdata.altitude, session->newdata.speed,
session->newdata.track, session->newdata.climb,
- session->newdata.mode, session->gpsdata.status,
- gps_maskdump(mask));
+ session->newdata.mode, session->gpsdata.status);
break;
case 0x23: /* Compact Super Packet */
session->driver.tsip.req_compact = 0;
@@ -731,13 +729,12 @@ static gps_mask_t tsip_analyze(struct gps_device_t *session)
REPORT_IS;
gpsd_report(LOG_DATA,
"SP-CSP 0x23: time=%.2f lat=%.2f lon=%.2f alt=%.2f "
- "speed=%.2f track=%.2f climb=%.2f "
- "mode=%d status=%d mask=%s\n", session->newdata.time,
+ "speed=%.2f track=%.2f climb=%.2f mode=%d status=%d\n",
+ session->newdata.time,
session->newdata.latitude, session->newdata.longitude,
session->newdata.altitude, session->newdata.speed,
session->newdata.track, session->newdata.climb,
- session->newdata.mode, session->gpsdata.status,
- gps_maskdump(mask));
+ session->newdata.mode, session->gpsdata.status);
break;
case 0xab: /* Thunderbolt Timing Superpacket */
@@ -833,14 +830,13 @@ static gps_mask_t tsip_analyze(struct gps_device_t *session)
mask |= LATLON_SET | ALTITUDE_SET | MODE_SET | REPORT_IS;
gpsd_report(LOG_DATA, "SP-TPS 0xac "
- "time=%.2f lat=%.2f lon=%.2f alt=%.2f mask=%s\n",
+ "time=%.2f lat=%.2f lon=%.2f alt=%.2f\n",
session->newdata.time,
session->newdata.latitude,
session->newdata.longitude,
- session->newdata.altitude, gps_maskdump(mask));
+ session->newdata.altitude);
break;
-
default:
gpsd_report(LOG_WARN, "Unhandled TSIP superpacket type 0x%02x\n",
u1);
diff --git a/driver_ubx.c b/driver_ubx.c
index d0de67fc..51445a96 100644
--- a/driver_ubx.c
+++ b/driver_ubx.c
@@ -115,7 +115,7 @@ ubx_msg_nav_sol(struct gps_device_t *session, unsigned char *buf,
mask |= MODE_SET | STATUS_SET;
gpsd_report(LOG_DATA,
- "NAVSOL: time=%.2f lat=%.2f lon=%.2f alt=%.2f track=%.2f speed=%.2f climb=%.2f mode=%d status=%d used=%d mask=%s\n",
+ "NAVSOL: time=%.2f lat=%.2f lon=%.2f alt=%.2f track=%.2f speed=%.2f climb=%.2f mode=%d status=%d used=%d\n",
session->newdata.time,
session->newdata.latitude,
session->newdata.longitude,
@@ -125,7 +125,7 @@ ubx_msg_nav_sol(struct gps_device_t *session, unsigned char *buf,
session->newdata.climb,
session->newdata.mode,
session->gpsdata.status,
- session->gpsdata.satellites_used, gps_maskdump(mask));
+ session->gpsdata.satellites_used);
return mask;
}
diff --git a/driver_zodiac.c b/driver_zodiac.c
index ef763759..92b5ced8 100644
--- a/driver_zodiac.c
+++ b/driver_zodiac.c
@@ -204,12 +204,12 @@ static gps_mask_t handle1000(struct gps_device_t *session)
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",
+ "1000: time=%.2f lat=%.2f lon=%.2f alt=%.2f track=%.2f speed=%.2f climb=%.2f mode=%d status=%d\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, gps_maskdump(mask));
+ session->gpsdata.status);
return mask;
}
diff --git a/gpsctl.c b/gpsctl.c
index e24a71b4..56e5dd86 100644
--- a/gpsctl.c
+++ b/gpsctl.c
@@ -107,6 +107,13 @@ static gps_mask_t get_packet(struct gps_device_t *session)
/*@ +usedef @*/
fieldmask = gpsd_poll(session);
+
+ /* conditional prevents mask dumper from eating CPU */
+ if (debuglevel >= LOG_DATA)
+ gpsd_report(LOG_DATA,
+ "packet mask = %s\n",
+ gps_maskdump(session->gpsdata.set));
+
if ((fieldmask &~ ONLINE_SET)!=0)
return fieldmask;
}
diff --git a/gpsd.c b/gpsd.c
index f13e0fba..4e8275b4 100644
--- a/gpsd.c
+++ b/gpsd.c
@@ -1294,9 +1294,6 @@ static void pseudonmea_report(struct subscriber_t *sub,
&& !TEXTUAL_PACKET_TYPE(device->packet.type)) {
char buf[MAX_PACKET_LENGTH * 3 + 2];
- gpsd_report(LOG_PROG, "data mask is %s\n",
- gps_maskdump(device->gpsdata.set));
-
if ((changed & REPORT_IS) != 0) {
nmea_tpv_dump(device, buf, sizeof(buf));
gpsd_report(LOG_IO, "<= GPS (binary tpv) %s: %s\n",
@@ -1417,10 +1414,12 @@ static void consume_packets(struct gps_device_t *device)
if ((changed & PACKET_SET) == 0)
break;
- gpsd_report(LOG_DATA,
- "packet from %s with %s\n",
- device->gpsdata.dev.path,
- gps_maskdump(device->gpsdata.set));
+ /* conditional prevents mask dumper from eating CPU */
+ if (debuglevel >= LOG_DATA)
+ gpsd_report(LOG_DATA,
+ "packet from %s with %s\n",
+ device->gpsdata.dev.path,
+ gps_maskdump(device->gpsdata.set));
#ifdef SOCKET_EXPORT_ENABLE
/* add any just-identified device to watcher lists */
@@ -1550,10 +1549,12 @@ static void consume_packets(struct gps_device_t *device)
/* some listeners may be in watcher mode */
if (sub->policy.watcher) {
if (changed & DATA_IS) {
- gpsd_report(LOG_PROG,
- "Changed mask: %s with %sreliable cycle detection\n",
- gps_maskdump(changed),
- device->cycle_end_reliable ? "" : "un");
+ /* guard keeps mask dumper from eating CPU */
+ if (debuglevel >= LOG_PROG)
+ gpsd_report(LOG_PROG,
+ "Changed mask: %s with %sreliable cycle detection\n",
+ gps_maskdump(changed),
+ device->cycle_end_reliable ? "" : "un");
if ((changed & REPORT_IS) != 0)
gpsd_report(LOG_PROG, "time to report a fix\n");
diff --git a/gpsmon.c b/gpsmon.c
index e8ad684a..12174b3b 100644
--- a/gpsmon.c
+++ b/gpsmon.c
@@ -229,6 +229,12 @@ static ssize_t readpkt(void)
if (changed == 0)
longjmp(terminate, TERM_EMPTY_READ);
+ /* conditional prevents mask dumper from eating CPU */
+ if (debuglevel >= LOG_DATA)
+ gpsd_report(LOG_DATA,
+ "packet mask = %s\n",
+ gps_maskdump(session.gpsdata.set));
+
if ((changed & ERROR_SET) != 0)
longjmp(terminate, TERM_READ_ERROR);
diff --git a/libgpsd_core.c b/libgpsd_core.c
index fa28711e..bb70cc94 100644
--- a/libgpsd_core.c
+++ b/libgpsd_core.c
@@ -716,8 +716,6 @@ static void gpsd_error_model(struct gps_device_t *session,
if (isnan(fix->time) == 0 && isnan(fix->ept) != 0)
fix->ept = 0.005;
/* Other error computations depend on having a valid fix */
- gpsd_report(LOG_DATA, "modeling errors: mode=%d, masks=%s\n",
- fix->mode, gps_maskdump(session->gpsdata.set));
if (fix->mode >= MODE_2D) {
if (isnan(fix->epx) != 0 && isfinite(session->gpsdata.dop.hdop) != 0)
fix->epx = session->gpsdata.dop.xdop * h_uere;
View Lorry Controller Status