diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2009-03-18 17:37:53 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2009-03-18 17:37:53 +0000 |
| commit | 91cd827bc5b4eeb70c6597c3d28c7c841f34cffc (patch) | |
| tree | fc374b705996a0d9a742338f6c9ebc713606f0a3 /driver_rtcm3.c | |
| parent | 1df47c95095d80d8b386d6584d6396bff7e187da (diff) | |
| download | gpsd-91cd827bc5b4eeb70c6597c3d28c7c841f34cffc.tar.gz | |
splint cleanup.
Diffstat (limited to 'driver_rtcm3.c')
| -rw-r--r-- | driver_rtcm3.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/driver_rtcm3.c b/driver_rtcm3.c index 3a64f216..c30bfb5c 100644 --- a/driver_rtcm3.c +++ b/driver_rtcm3.c @@ -121,7 +121,7 @@ void rtcm3_unpack(/*@out@*/struct rtcm3_t *rtcm, char *buf) rtcm->rtcmtypes.rtcm3_1002.rtk_data[i].L1.ambiguity = (bool)ugrab(8); rtcm->rtcmtypes.rtcm3_1002.rtk_data[i].L1.CNR = (bool)ugrab(8) * CARRIER_NOISE_RATIO_UNITS; } - assert(bitcount == 64 + 74*rtcm->rtcmtypes.rtcm3_1001.header.satcount); + assert(bitcount == 64 + 74*rtcm->rtcmtypes.rtcm3_1002.header.satcount); break; case 1003: /* GPS Basic RTK, L1 & L2 */ @@ -158,7 +158,7 @@ void rtcm3_unpack(/*@out@*/struct rtcm3_t *rtcm, char *buf) rtcm->rtcmtypes.rtcm3_1003.rtk_data[i].L2.rangediff = temp * PSEUDORANGE_DIFF_RESOLUTION; rtcm->rtcmtypes.rtcm3_1003.rtk_data[i].L2.locktime = (unsigned char)sgrab(7); } - assert(bitcount == 64 + 101*rtcm->rtcmtypes.rtcm3_1001.header.satcount); + assert(bitcount == 64 + 101*rtcm->rtcmtypes.rtcm3_1003.header.satcount); break; case 1004: /* GPS Extended RTK, L1 & L2 */ @@ -199,7 +199,7 @@ void rtcm3_unpack(/*@out@*/struct rtcm3_t *rtcm, char *buf) rtcm->rtcmtypes.rtcm3_1004.rtk_data[i].L2.ambiguity = (bool)ugrab(8); rtcm->rtcmtypes.rtcm3_1004.rtk_data[i].L2.CNR = (bool)ugrab(8) * CARRIER_NOISE_RATIO_UNITS; } - assert(bitcount == 64 + 125*rtcm->rtcmtypes.rtcm3_1001.header.satcount); + assert(bitcount == 64 + 125*rtcm->rtcmtypes.rtcm3_1004.header.satcount); break; case 1005: /* Stationary Antenna Reference Point, No Height Information */ @@ -316,7 +316,7 @@ void rtcm3_unpack(/*@out@*/struct rtcm3_t *rtcm, char *buf) rtcm->rtcmtypes.rtcm3_1010.rtk_data[i].L1.ambiguity = (bool)ugrab(7); rtcm->rtcmtypes.rtcm3_1010.rtk_data[i].L1.CNR = (bool)ugrab(8) * CARRIER_NOISE_RATIO_UNITS; } - assert(bitcount == 61 + 79*rtcm->rtcmtypes.rtcm3_1009.header.satcount); + assert(bitcount == 61 + 79*rtcm->rtcmtypes.rtcm3_1010.header.satcount); break; case 1011: /* GLONASS Basic RTK, L1 & L2 */ @@ -359,7 +359,7 @@ void rtcm3_unpack(/*@out@*/struct rtcm3_t *rtcm, char *buf) rtcm->rtcmtypes.rtcm3_1011.rtk_data[i].L2.ambiguity = (bool)ugrab(7); rtcm->rtcmtypes.rtcm3_1011.rtk_data[i].L2.CNR = (bool)ugrab(8) * CARRIER_NOISE_RATIO_UNITS; } - assert(bitcount == 61 + 107*rtcm->rtcmtypes.rtcm3_1009.header.satcount); + assert(bitcount == 61 + 107*rtcm->rtcmtypes.rtcm3_1011.header.satcount); break; case 1012: /* GLONASS Extended RTK, L1 & L2 */ @@ -397,7 +397,7 @@ void rtcm3_unpack(/*@out@*/struct rtcm3_t *rtcm, char *buf) rtcm->rtcmtypes.rtcm3_1012.rtk_data[i].L2.rangediff = temp * PSEUDORANGE_DIFF_RESOLUTION; rtcm->rtcmtypes.rtcm3_1012.rtk_data[i].L2.locktime = (unsigned char)sgrab(7); } - assert(bitcount == 61 + 130*rtcm->rtcmtypes.rtcm3_1009.header.satcount); + assert(bitcount == 61 + 130*rtcm->rtcmtypes.rtcm3_1012.header.satcount); break; case 1013: /* System Parameters */ @@ -725,10 +725,10 @@ void rtcm3_dump(struct rtcm3_t *rtcm, FILE *fp) case 1014: (void)fprintf(fp, - " netid=%u subnetid=%d statcount=%d master=%d aux=%d lat=%f, lon=%f, alt=%f\n", + " netid=%u subnetid=%u statcount=%u master=%u aux=%u lat=%f, lon=%f, alt=%f\n", rtcm->rtcmtypes.rtcm3_1014.network_id, rtcm->rtcmtypes.rtcm3_1014.subnetwork_id, - (int)rtcm->rtcmtypes.rtcm3_1014.stationcount, + (uint)rtcm->rtcmtypes.rtcm3_1014.stationcount, rtcm->rtcmtypes.rtcm3_1014.master_id, rtcm->rtcmtypes.rtcm3_1014.aux_id, rtcm->rtcmtypes.rtcm3_1014.d_lat, |