diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2011-06-17 02:23:58 -0400 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2011-06-17 02:23:58 -0400 |
| commit | 0d3f1eb114c9733519a25f8881b85cb81a7d37a0 (patch) | |
| tree | ca41b5e9e9ca78637795fbfa5d27b0991dde588d /driver_evermore.c | |
| parent | 730b2feea3b2da3d046b25b119375682dea5e179 (diff) | |
| download | gpsd-0d3f1eb114c9733519a25f8881b85cb81a7d37a0.tar.gz | |
Cut down on gpsd_hexdump_wrapper() calls.
This awkward construct seems to have triggered some sort of toolchain
bug. The symptom is that gpsd_hexdump_level has different values depending
on whether we test it inside or outside of hex.c.
As a first step towards eliminating this global, we throw out a bunch
of hex logging that is duplicative or not really needed for production
drivers. Experimental drivers can call the hex dumper unconditionally.
The goal is to reduce the number of uses of this variable to eliminate it
withoud doing violence to the internal APIs. This is a first step.
All regression tests pass.
Diffstat (limited to 'driver_evermore.c')
| -rw-r--r-- | driver_evermore.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/driver_evermore.c b/driver_evermore.c index ad5f703f..f5e31c4c 100644 --- a/driver_evermore.c +++ b/driver_evermore.c @@ -157,10 +157,6 @@ gps_mask_t evermore_parse(struct gps_device_t * session, unsigned char *buf, if (*cp == 0x10) cp++; datalen = (size_t) * cp++; - - gpsd_report(LOG_RAW, "raw EverMore packet type 0x%02x, length %zd: %s\n", - *cp, len, gpsd_hexdump_wrapper(buf, len, LOG_RAW)); - datalen -= 2; /*@ -usedef @*/ @@ -363,13 +359,11 @@ gps_mask_t evermore_parse(struct gps_device_t * session, unsigned char *buf, return TIME_SET | PPSTIME_IS | RAW_IS; case 0x20: /* LogConfig Info, could be used as a probe for EverMore GPS */ - gpsd_report(LOG_IO, "LogConfig EverMore packet, length %zd: %s\n", - datalen, gpsd_hexdump_wrapper(buf2, datalen, LOG_IO)); + gpsd_report(LOG_IO, "LogConfig EverMore packet, length %zd\n", datalen); return ONLINE_SET; case 0x22: /* LogData */ - gpsd_report(LOG_IO, "LogData EverMore packet, length %zd: %s\n", - datalen, gpsd_hexdump_wrapper(buf2, datalen, LOG_IO)); + gpsd_report(LOG_IO, "LogData EverMore packet, length %zd\n", datalen); return ONLINE_SET; case 0x38: /* ACK */ @@ -378,9 +372,8 @@ gps_mask_t evermore_parse(struct gps_device_t * session, unsigned char *buf, default: gpsd_report(LOG_WARN, - "unknown EverMore packet EID 0x%02x, length %zd: %s\n", - buf2[0], datalen, gpsd_hexdump_wrapper(buf2, datalen, - LOG_WARN)); + "unknown EverMore packet EID 0x%02x, length %zd\n", + buf2[0], datalen); return 0; } } |