diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2014-08-27 20:26:01 -0400 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2014-08-27 20:26:56 -0400 |
| commit | 068a90a92337d8476a69ed0048723e7587f6209f (patch) | |
| tree | fdf92a4fad19701d7469d827feeb4ae5b51c4fb2 /driver_zodiac.c | |
| parent | 7b0feb181260ff4e005547a3ae870ebc545b1e85 (diff) | |
| download | gpsd-068a90a92337d8476a69ed0048723e7587f6209f.tar.gz | |
Now that the transition is done we can restore the gpsd_report name.
All regression tests pass.
Diffstat (limited to 'driver_zodiac.c')
| -rw-r--r-- | driver_zodiac.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/driver_zodiac.c b/driver_zodiac.c index 0af1eccf..36c97116 100644 --- a/driver_zodiac.c +++ b/driver_zodiac.c @@ -85,7 +85,7 @@ static ssize_t zodiac_spew(struct gps_device_t *session, unsigned short type, if (end_write(session->gpsdata.gps_fd, &h, hlen) != (ssize_t) hlen || end_write(session->gpsdata.gps_fd, dat, datlen) != (ssize_t) datlen) { - gpsd_notify(&session->context->errout, LOG_RAW, + gpsd_report(&session->context->errout, LOG_RAW, "Reconfigure write failed\n"); return -1; } @@ -98,7 +98,7 @@ static ssize_t zodiac_spew(struct gps_device_t *session, unsigned short type, (void)snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %04x", dat[i]); - gpsd_notify(&session->context->errout, LOG_RAW, + gpsd_report(&session->context->errout, LOG_RAW, "Sent Zodiac packet: %s\n", buf); return 0; @@ -203,7 +203,7 @@ static gps_mask_t handle1000(struct gps_device_t *session) mask = TIME_SET | PPSTIME_IS | LATLON_SET | ALTITUDE_SET | CLIMB_SET | SPEED_SET | TRACK_SET | STATUS_SET | MODE_SET; - gpsd_notify(&session->context->errout, LOG_DATA, + gpsd_report(&session->context->errout, LOG_DATA, "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, @@ -249,7 +249,7 @@ static gps_mask_t handle1002(struct gps_device_t *session) session->gpsdata.skyview_time = gpsd_gpstime_resolve(session, (unsigned short)gps_week, (double)gps_seconds); - gpsd_notify(&session->context->errout, LOG_DATA, + gpsd_report(&session->context->errout, LOG_DATA, "1002: visible=%d used=%d mask={SATELLITE|USED}\n", session->gpsdata.satellites_visible, session->gpsdata.satellites_used); @@ -295,7 +295,7 @@ static gps_mask_t handle1003(struct gps_device_t *session) } } session->gpsdata.skyview_time = NAN; - gpsd_notify(&session->context->errout, LOG_DATA, + gpsd_report(&session->context->errout, LOG_DATA, "NAVDOP: visible=%d gdop=%.2f pdop=%.2f " "hdop=%.2f vdop=%.2f tdop=%.2f mask={SATELLITE|DOP}\n", session->gpsdata.satellites_visible, @@ -330,7 +330,7 @@ static gps_mask_t handle1011(struct gps_device_t *session) * The Zodiac is supposed to send one of these messages on startup. */ getstringz(session->subtype, session->lexer.outbuffer, 19, 28); /* software version field */ - gpsd_notify(&session->context->errout, LOG_DATA, + gpsd_report(&session->context->errout, LOG_DATA, "1011: subtype=%s mask={DEVICEID}\n", session->subtype); return DEVICEID_SET; @@ -355,7 +355,7 @@ static gps_mask_t zodiac_analyze(struct gps_device_t *session) unsigned int id = (unsigned int)((session->lexer.outbuffer[3] << 8) | session->lexer.outbuffer[2]); - gpsd_notify(&session->context->errout, LOG_RAW, + gpsd_report(&session->context->errout, LOG_RAW, "Raw Zodiac packet type %d length %zd: %s\n", id, session->lexer.outbuflen, gpsd_prettydump(session)); |