From 009ba6e3452df29cbf1757bc0c79dc14683a98da Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Sat, 28 Mar 2015 19:02:23 -0400 Subject: Clean up most spint errors. All regression tests pass. --- driver_nmea2000.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'driver_nmea2000.c') diff --git a/driver_nmea2000.c b/driver_nmea2000.c index 0975e4c0..0ede7e79 100644 --- a/driver_nmea2000.c +++ b/driver_nmea2000.c @@ -67,7 +67,7 @@ static int scale_int(int32_t var, const int64_t factor) ret = var; ret *= factor; - ret >>= 32; + /*@i1@*/ ret >>= 32; return((int)ret); } @@ -1395,36 +1395,36 @@ static void find_pgn(struct can_frame *frame, struct gps_device_t *session) gpsd_log(&session->context->errout, LOG_DATA, "pgn %6d:%s \n", work->pgn, work->name); session->driver.nmea2000.workpgn = (void *) work; - session->lexer.outbuflen = frame->can_dlc & 0x0f; + /*@i1@*/session->lexer.outbuflen = frame->can_dlc & 0x0f; for (l2=0;l2lexer.outbuflen;l2++) { - session->lexer.outbuffer[l2]= frame->data[l2]; + /*@i1@*/session->lexer.outbuffer[l2]= frame->data[l2]; } - } else if ((frame->data[0] & 0x1f) == 0) { + /*@i1@*/} else if ((frame->data[0] & 0x1f) == 0) { unsigned int l2; - session->driver.nmea2000.fast_packet_len = frame->data[1]; - session->driver.nmea2000.idx = frame->data[0]; + /*@i2@*/session->driver.nmea2000.fast_packet_len = frame->data[1]; + /*@i2@*/session->driver.nmea2000.idx = frame->data[0]; #if NMEA2000_FAST_DEBUG gpsd_log(&session->context->errout, LOG_ERROR, "Set idx %2x %2x %2x %6d\n", - frame->data[0], + /*@i1@*/frame->data[0], session->driver.nmea2000.unit, - frame->data[1], + /*@i1@*/frame->data[1], source_pgn); #endif /* of #if NMEA2000_FAST_DEBUG */ session->lexer.inbuflen = 0; session->driver.nmea2000.idx += 1; for (l2=2;l2<8;l2++) { - session->lexer.inbuffer[session->lexer.inbuflen++] = frame->data[l2]; + /*@i1@*/session->lexer.inbuffer[session->lexer.inbuflen++] = frame->data[l2]; } gpsd_log(&session->context->errout, LOG_DATA, "pgn %6d:%s \n", work->pgn, work->name); - } else if (frame->data[0] == session->driver.nmea2000.idx) { + /*@i1@*/} 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) { - session->lexer.inbuffer[session->lexer.inbuflen++] = frame->data[l2]; + /*@i1@*/session->lexer.inbuffer[session->lexer.inbuflen++] = frame->data[l2]; } } if (session->lexer.inbuflen == session->driver.nmea2000.fast_packet_len) { @@ -1450,7 +1450,7 @@ static void find_pgn(struct can_frame *frame, struct gps_device_t *session) gpsd_log(&session->context->errout, LOG_ERROR, "Fast error %2x %2x %2x %2x %6d\n", session->driver.nmea2000.idx, - frame->data[0], + /*@i2@*/frame->data[0], session->driver.nmea2000.unit, (unsigned int) session->driver.nmea2000.fast_packet_len, source_pgn); -- cgit v1.2.1