diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2015-03-29 17:45:08 -0400 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2015-03-29 17:47:37 -0400 |
| commit | 7142e1766ca60d08c377e902620d4478d4bf6d70 (patch) | |
| tree | 9a12c1951a816a8cfe21e847b0652c8a0754b00f /driver_nmea2000.c | |
| parent | 8a254d4074a73b6db19fd7943bd9349f2feb12e6 (diff) | |
| download | gpsd-7142e1766ca60d08c377e902620d4478d4bf6d70.tar.gz | |
Beat the splint beast into submission.
Code splints clean, all regression tests pass, but 1PPS is not being detected
and wasn't before this changeset. Debug messages suggest the trailing edge
is being rejected.
Diffstat (limited to 'driver_nmea2000.c')
| -rw-r--r-- | driver_nmea2000.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/driver_nmea2000.c b/driver_nmea2000.c index 0ede7e79..957a55fb 100644 --- a/driver_nmea2000.c +++ b/driver_nmea2000.c @@ -1397,9 +1397,9 @@ static void find_pgn(struct can_frame *frame, struct gps_device_t *session) session->driver.nmea2000.workpgn = (void *) work; /*@i1@*/session->lexer.outbuflen = frame->can_dlc & 0x0f; for (l2=0;l2<session->lexer.outbuflen;l2++) { - /*@i1@*/session->lexer.outbuffer[l2]= frame->data[l2]; + /*@i3@*/session->lexer.outbuffer[l2]= frame->data[l2]; } - /*@i1@*/} else if ((frame->data[0] & 0x1f) == 0) { + /*@i2@*/} else if ((frame->data[0] & 0x1f) == 0) { unsigned int l2; /*@i2@*/session->driver.nmea2000.fast_packet_len = frame->data[1]; @@ -1415,16 +1415,16 @@ static void find_pgn(struct can_frame *frame, struct gps_device_t *session) session->lexer.inbuflen = 0; session->driver.nmea2000.idx += 1; for (l2=2;l2<8;l2++) { - /*@i1@*/session->lexer.inbuffer[session->lexer.inbuflen++] = frame->data[l2]; + /*@i3@*/session->lexer.inbuffer[session->lexer.inbuflen++] = frame->data[l2]; } gpsd_log(&session->context->errout, LOG_DATA, "pgn %6d:%s \n", work->pgn, work->name); - /*@i1@*/} else if (frame->data[0] == session->driver.nmea2000.idx) { + /*@i2@*/} else if (frame->data[0] == session->driver.nmea2000.idx) { unsigned int l2; for (l2=1;l2<8;l2++) { if (session->driver.nmea2000.fast_packet_len > session->lexer.inbuflen) { - /*@i1@*/session->lexer.inbuffer[session->lexer.inbuflen++] = frame->data[l2]; + /*@i3@*/session->lexer.inbuffer[session->lexer.inbuflen++] = frame->data[l2]; } } if (session->lexer.inbuflen == session->driver.nmea2000.fast_packet_len) { |