diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2014-08-24 10:17:59 -0400 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2014-08-24 10:17:59 -0400 |
| commit | 0658c2fb8d15fbe78fdd4edd1be184559ab53c32 (patch) | |
| tree | b61f6cc53b9aaf5d0575f93966b18a799861460b /driver_tsip.c | |
| parent | e18934bf45246408915652f7b6a5e5ce66cccd8a (diff) | |
| download | gpsd-0658c2fb8d15fbe78fdd4edd1be184559ab53c32.tar.gz | |
Drop the obsolete tag field from JSON output. Bump the minor protocol number.
Required a regression-test rebuild, of course. The field is still set by
the TSIP and SiRF drivers; the SiRF driver actually uses it. It may be
possible to eliminate the TSIP uses, but so far attempting this has
produced odd regression-test failures.
Diffstat (limited to 'driver_tsip.c')
| -rw-r--r-- | driver_tsip.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/driver_tsip.c b/driver_tsip.c index c125927f..d731f191 100644 --- a/driver_tsip.c +++ b/driver_tsip.c @@ -162,7 +162,7 @@ static gps_mask_t tsip_parse_input(struct gps_device_t *session) } /*@ -charint @*/ - (void)snprintf(session->gpsdata.tag, sizeof(session->gpsdata.tag), + (void)snprintf(session->tag, sizeof(session->tag), "ID%02x", id = (unsigned)session->packet.outbuffer[1]); gpsd_report(session->context->debug, LOG_DATA, @@ -196,9 +196,9 @@ static gps_mask_t tsip_parse_input(struct gps_device_t *session) */ u1 = (uint8_t) getub(buf, 0); if (u1 == 0x81) { /* Software Version Information */ - (void)snprintf(session->gpsdata.tag + strlen(session->gpsdata.tag), - sizeof(session->gpsdata.tag) - - strlen(session->gpsdata.tag), "%02x", (uint) u1); + (void)snprintf(session->tag + strlen(session->tag), + sizeof(session->tag) - + strlen(session->tag), "%02x", (uint) u1); u2 = getub(buf, 2); /* Major version */ u3 = getub(buf, 3); /* Minor version */ u4 = getub(buf, 4); /* Build number */ @@ -223,9 +223,9 @@ static gps_mask_t tsip_parse_input(struct gps_device_t *session) mask |= DEVICEID_SET; } if (u1 == 0x83) { /* Hardware Version Information */ - (void)snprintf(session->gpsdata.tag + strlen(session->gpsdata.tag), - sizeof(session->gpsdata.tag) - - strlen(session->gpsdata.tag), "%02x", (uint) u1); + (void)snprintf(session->tag + strlen(session->tag), + sizeof(session->tag) - + strlen(session->tag), "%02x", (uint) u1); ul1 = getbeu32(buf, 1); /* Serial number */ u2 = getub(buf, 5); /* Build day */ u3 = getub(buf, 6); /* Build month */ @@ -667,9 +667,9 @@ static gps_mask_t tsip_parse_input(struct gps_device_t *session) case 0x8f: /* Super Packet. Well... */ /*@ +charint @*/ u1 = (uint8_t) getub(buf, 0); - (void)snprintf(session->gpsdata.tag + strlen(session->gpsdata.tag), - sizeof(session->gpsdata.tag) - - strlen(session->gpsdata.tag), "%02x", (uint) u1); + (void)snprintf(session->tag + strlen(session->tag), + sizeof(session->tag) - + strlen(session->tag), "%02x", (uint) u1); /*@ -charint @*/ switch (u1) { /* sub-packet ID */ case 0x15: /* Current Datum Values */ |