diff options
-rw-r--r-- | driver_evermore.c | 3 | ||||
-rw-r--r-- | driver_garmin.c | 9 | ||||
-rw-r--r-- | driver_geostar.c | 2 | ||||
-rw-r--r-- | driver_italk.c | 3 | ||||
-rw-r--r-- | driver_nmea0183.c | 3 | ||||
-rw-r--r-- | driver_oncore.c | 2 | ||||
-rw-r--r-- | driver_proto.c | 2 | ||||
-rw-r--r-- | driver_sirf.c | 4 | ||||
-rw-r--r-- | driver_superstar2.c | 2 | ||||
-rw-r--r-- | driver_tsip.c | 2 | ||||
-rw-r--r-- | driver_ubx.c | 2 | ||||
-rw-r--r-- | gpsd.c | 18 |
12 files changed, 30 insertions, 22 deletions
diff --git a/driver_evermore.c b/driver_evermore.c index f9fb01c1..1facd53e 100644 --- a/driver_evermore.c +++ b/driver_evermore.c @@ -508,7 +508,8 @@ static bool evermore_nmea_config(struct gps_device_t *session, int mode) static void evermore_mode(struct gps_device_t *session, int mode) { - gpsd_report(session->context->debug, LOG_PROG, "evermore_mode(%d), %d\n", mode, + gpsd_report(session->context->debug, LOG_PROG, + "evermore_mode(%d), %d\n", mode, session->back_to_nmea ? 1 : 0); if (mode == MODE_NMEA) { /* NMEA */ diff --git a/driver_garmin.c b/driver_garmin.c index 2ed68cf7..e3768e85 100644 --- a/driver_garmin.c +++ b/driver_garmin.c @@ -754,7 +754,7 @@ static void Build_Send_USB_Packet(struct gps_device_t *session, theBytesReturned = gpsd_write(session, (const char *)thePacket, (size_t) theBytesToWrite); - gpsd_report(session->context->debug, LOG_DATA, + gpsd_report(session->context->debug, LOG_PROG, "Garmin: SendPacket(), wrote %zd bytes\n", theBytesReturned); @@ -827,7 +827,7 @@ static void Build_Send_SER_Packet(struct gps_device_t *session, theBytesReturned = gpsd_write(session, (const char *)thePacket, (size_t) theBytesToWrite); - gpsd_report(session->context->debug, LOG_DATA, + gpsd_report(session->context->debug, LOG_PROG, "Garmin: SendPacket(), wrote %zd bytes\n", theBytesReturned); @@ -1008,7 +1008,8 @@ static void garmin_event_hook(struct gps_device_t *session, event_t event) } if (event == event_deactivate) /* FIX-ME: is any action needed, or is closing the port sufficient? */ - gpsd_report(session->context->debug, LOG_PROG, "Garmin: garmin_close()\n"); + gpsd_report(session->context->debug, LOG_PROG, + "Garmin: garmin_close()\n"); } #define Send_ACK() Build_Send_SER_Packet(session, 0, ACK, 0, 0) @@ -1189,7 +1190,7 @@ static void garmin_switcher(struct gps_device_t *session, int mode) ssize_t status = gpsd_write(session, switcher, sizeof(switcher)); /*@ -charint @*/ if (status == (ssize_t)sizeof(switcher)) { - gpsd_report(session->context->debug, LOG_DATA, + gpsd_report(session->context->debug, LOG_PROG, "Garmin: => GPS: turn off binary %02x %02x %02x... \n", switcher[0], switcher[1], switcher[2]); } else { diff --git a/driver_geostar.c b/driver_geostar.c index fbe3f9f5..d81b2d2a 100644 --- a/driver_geostar.c +++ b/driver_geostar.c @@ -68,7 +68,7 @@ static int geostar_write(struct gps_device_t *session, session->msgbuflen = len * 4; - gpsd_report(session->context->debug, LOG_DATA, + gpsd_report(session->context->debug, LOG_PROG, "Sent GeoStar packet id 0x%x\n", id); if (gpsd_write(session, session->msgbuf, session->msgbuflen) != (ssize_t) session->msgbuflen) diff --git a/driver_italk.c b/driver_italk.c index 24cc1209..e5c9e7e5 100644 --- a/driver_italk.c +++ b/driver_italk.c @@ -212,7 +212,8 @@ static gps_mask_t decode_itk_subframe(struct gps_device_t *session, flags = (unsigned short) getleu16(buf, 7 + 4); prn = (unsigned short) getleu16(buf, 7 + 6); sf = (unsigned short) getleu16(buf, 7 + 8); - gpsd_report(session->context->debug, LOG_PROG, "iTalk 50B SUBFRAME prn %u sf %u - decode %s %s\n", + gpsd_report(session->context->debug, LOG_PROG, + "iTalk 50B SUBFRAME prn %u sf %u - decode %s %s\n", prn, sf, flags & SUBFRAME_WORD_FLAG_MASK ? "error" : "ok", flags & SUBFRAME_GPS_PREAMBLE_INVERTED ? "(inverted)" : ""); diff --git a/driver_nmea0183.c b/driver_nmea0183.c index ff0b6ae7..43e576a9 100644 --- a/driver_nmea0183.c +++ b/driver_nmea0183.c @@ -607,7 +607,8 @@ static gps_mask_t processGPGSV(int count, char *field[], /* not valid data until we've seen a complete set of parts */ if (session->driver.nmea.part < session->driver.nmea.await) { - gpsd_report(session->context->debug, LOG_PROG, "Partial satellite data (%d of %d).\n", + gpsd_report(session->context->debug, LOG_PROG, + "Partial satellite data (%d of %d).\n", session->driver.nmea.part, session->driver.nmea.await); return ONLINE_SET; } diff --git a/driver_oncore.c b/driver_oncore.c index 24f6b121..f6956814 100644 --- a/driver_oncore.c +++ b/driver_oncore.c @@ -429,7 +429,7 @@ static ssize_t oncore_control_send(struct gps_device_t *session, session->msgbuf[msglen + 4] = '\n'; session->msgbuflen = msglen + 5; - gpsd_report(session->context->debug, LOG_DATA, + gpsd_report(session->context->debug, LOG_PROG, "writing oncore control type %c%c\n", msg[0], msg[1]); return gpsd_write(session, session->msgbuf, session->msgbuflen); } diff --git a/driver_proto.c b/driver_proto.c index b85e3818..bd008945 100644 --- a/driver_proto.c +++ b/driver_proto.c @@ -358,7 +358,7 @@ static ssize_t _proto__control_send(struct gps_device_t *session, /* we may need to dump the message */ return gpsd_write(session, session->msgbuf, session->msgbuflen); - gpsd_report(session->context->debug, LOG_DATA, + gpsd_report(session->context->debug, LOG_PROG, "writing _proto_ control type %02x\n"); return gpsd_write(session, session->msgbuf, session->msgbuflen); } diff --git a/driver_sirf.c b/driver_sirf.c index a2eaa752..20baf445 100644 --- a/driver_sirf.c +++ b/driver_sirf.c @@ -240,8 +240,8 @@ static bool sirf_write(struct gps_device_t *session, unsigned char *msg) msg[len + 4] = (unsigned char)((crc & 0xff00) >> 8); msg[len + 5] = (unsigned char)(crc & 0x00ff); - gpsd_report(session->context->debug, - LOG_DATA, "SiRF: Writing control type %02x:\n", msg[4]); + gpsd_report(session->context->debug, LOG_PROG, + "SiRF: Writing control type %02x:\n", msg[4]); ok = (gpsd_write(session, (const char *)msg, len+8) == (ssize_t) (len+8)); return (ok); } diff --git a/driver_superstar2.c b/driver_superstar2.c index 4a4c2cd5..a09eab60 100644 --- a/driver_superstar2.c +++ b/driver_superstar2.c @@ -376,7 +376,7 @@ superstar2_write(struct gps_device_t *session, char *msg, size_t msglen) c += 0x100; msg[(int)msg[3] + 4] = (char)((c >> 8) & 0xff); msg[(int)msg[3] + 5] = (char)(c & 0xff); - gpsd_report(session->context->debug, LOG_DATA, + gpsd_report(session->context->debug, LOG_PROG, "writing superstar2 control type %d len %zu\n", (int)msg[1] & 0x7f, msglen); return gpsd_write(session, msg, msglen); diff --git a/driver_tsip.c b/driver_tsip.c index a8af1722..73d1e66a 100644 --- a/driver_tsip.c +++ b/driver_tsip.c @@ -55,7 +55,7 @@ static int tsip_write(struct gps_device_t *session, *ep++ = '\x03'; session->msgbuflen = (size_t) (ep - session->msgbuf); /*@ -charint @*/ - gpsd_report(session->context->debug, LOG_DATA, + gpsd_report(session->context->debug, LOG_PROG, "Sent TSIP packet id 0x%02x\n", id); if (gpsd_write(session, session->msgbuf, session->msgbuflen) != (ssize_t) session->msgbuflen) diff --git a/driver_ubx.c b/driver_ubx.c index edd94d24..de132183 100644 --- a/driver_ubx.c +++ b/driver_ubx.c @@ -572,7 +572,7 @@ bool ubx_write(struct gps_device_t * session, /*@ +type @*/ - gpsd_report(session->context->debug, LOG_DATA, + gpsd_report(session->context->debug, LOG_PROG, "=> GPS: UBX class: %02x, id: %02x, len: %zd, crc: %02x%02x\n", msg_class, msg_id, data_len, CK_A, CK_B); @@ -921,7 +921,7 @@ static bool awaken(struct gps_device_t *device) /* open that device */ if (!initialized_device(device)) { if (!open_device(device)) { - gpsd_report(context.debug, LOG_PROG, + gpsd_report(context.debug, LOG_WARN, "%s: open failed\n", device->gpsdata.dev.path); free_device(device); @@ -2008,9 +2008,11 @@ int main(int argc, char *argv[]) #ifdef SHM_EXPORT_ENABLE /* create the shared segment as root so readers can't mess with it */ if (!shm_acquire(&context)) { - gpsd_report(context.debug, LOG_ERROR, "shared-segment creation failed,\n"); + gpsd_report(context.debug, LOG_ERROR, + "shared-segment creation failed,\n"); } else - gpsd_report(context.debug, LOG_PROG, "shared-segment creation succeeded,\n"); + gpsd_report(context.debug, LOG_PROG, + "shared-segment creation succeeded,\n"); #endif /* SHM_EXPORT_ENABLE */ /* @@ -2392,10 +2394,12 @@ int main(int argc, char *argv[]) device->gpsdata.gps_fd); } else if (timestamp() - device->releasetime > RELEASE_TIMEOUT) { - gpsd_report(context.debug, LOG_PROG, "device %d closed\n", - (int)(device - devices)); - gpsd_report(context.debug, LOG_RAW, "unflagging descriptor %d\n", - device->gpsdata.gps_fd); + gpsd_report(context.debug, LOG_PROG, + "device %d closed\n", + (int)(device - devices)); + gpsd_report(context.debug, LOG_RAW, + "unflagging descriptor %d\n", + device->gpsdata.gps_fd); deactivate_device(device); } } |