提交 ebf13b23 编写于 作者: D dengchengliang 提交者: fengqikai1414

Drivers: fix compile warning in rtklib

上级 98dff95c
......@@ -1025,6 +1025,7 @@ static int decode_galephemerisb(raw_t* raw) {
rcv_fnav = U4(p) & 1;
p += 4;
rcv_inav = U4(p) & 1;
(void)rcv_inav;
p += 4;
svh_e1b = U1(p) & 3;
p += 1;
......@@ -1159,8 +1160,10 @@ static int decode_galalmanacb(raw_t* raw) {
prn = U4(p);
p += 4;
rcv_fnav = U4(p) & 1;
(void)rcv_fnav;
p += 4;
rcv_inav = U4(p) & 1;
(void)rcv_inav;
p += 4;
svh_e1b = U1(p) & 3;
p += 1;
......@@ -1169,6 +1172,7 @@ static int decode_galalmanacb(raw_t* raw) {
svh_e5b = U1(p) & 3;
p += 1 + 1;
ioda = U4(p);
(void)ioda;
p += 4;
alm.week = U4(p);
p += 4; /* gst week */
......@@ -1208,17 +1212,17 @@ static int decode_galclockb(raw_t* raw) {
unsigned char* p = raw->buff + OEM4HLEN;
double a0 = 0.0;
double a1 = 0.0;
double a0g = 0.0;
double a1g = 0.0;
//double a0g = 0.0;
//double a1g = 0.0;
int leaps = 0;
//int leaps = 0;
int tot = 0;
int wnt = 0;
int wnlsf = 0;
int dn = 0;
int dtlsf = 0;
int t0g = 0;
int wn0g = 0;
//int wnlsf = 0;
//int dn = 0;
//int dtlsf = 0;
//int t0g = 0;
//int wn0g = 0;
trace(3, "decode_galclockb: len=%d\n", raw->len);
......@@ -1230,25 +1234,33 @@ static int decode_galclockb(raw_t* raw) {
p += 8;
a1 = R8(p);
p += 8;
leaps = I4(p);
//leaps = I4(p);
I4(p);
p += 4;
tot = U4(p);
p += 4;
wnt = U4(p);
p += 4;
wnlsf = U4(p);
//wnlsf = U4(p);
U4(p);
p += 4;
dn = U4(p);
//dn = U4(p);
U4(p);
p += 4;
dtlsf = U4(p);
//dtlsf = U4(p);
U4(p);
p += 4;
a0g = R8(p);
//a0g = R8(p);
R8(p);
p += 8;
a1g = R8(p);
//a1g = R8(p);
R8(p);
p += 8;
t0g = U4(p);
//t0g = U4(p);
U4(p);
p += 4;
wn0g = U4(p);
//wn0g = U4(p);
U4(p);
raw->nav.utc_gal[0] = a0;
raw->nav.utc_gal[1] = a1;
......@@ -1285,6 +1297,7 @@ static int decode_galionob(raw_t* raw) {
sf[3] = U1(p);
p += 1;
sf[4] = U1(p);
(void)sf;
for (i = 0; i < 3; ++i) {
raw->nav.ion_gal[i] = ai[i];
......@@ -1297,7 +1310,7 @@ static int decode_galfnavrawpageb(raw_t* raw) {
unsigned char* p = raw->buff + OEM4HLEN;
unsigned char buff[27];
int i = 0;
int sigch = 0;
//int sigch = 0;
int satid = 0;
int page = 0;
......@@ -1307,7 +1320,8 @@ static int decode_galfnavrawpageb(raw_t* raw) {
trace(2, "oem4 galfnavrawpageb length error: len=%d\n", raw->len);
return -1;
}
sigch = U4(p);
//sigch = U4(p);
U4(p);
p += 4;
satid = U4(p);
p += 4;
......@@ -1330,7 +1344,7 @@ static int decode_galinavrawwordb(raw_t* raw) {
gtime_t time = raw->time;
char* sig = NULL;
int i = 0;
int sigch = 0;
//int sigch = 0;
int satid = 0;
int sigtype = 0;
int type = 0;
......@@ -1343,7 +1357,8 @@ static int decode_galinavrawwordb(raw_t* raw) {
trace(2, "oem4 galinavrawwordb length error: len=%d\n", raw->len);
return -1;
}
sigch = U4(p);
//sigch = U4(p);
U4(p);
p += 4;
satid = U4(p);
p += 4;
......@@ -1396,6 +1411,7 @@ static int decode_rawcnavframeb(raw_t* raw) {
return -1;
}
sigch = U4(p);
(void)sigch;
p += 4;
prn = U4(p);
p += 4;
......
......@@ -435,11 +435,11 @@ extern int decode_glostr(const unsigned char* buff, geph_t* geph) {
double tod = 0.0;
double tof = 0.0;
double toe = 0.0;
int P = 0;
int P1 = 0;
int P2 = 0;
int P3 = 0;
int P4 = 0;
// int P = 0;
// int P1 = 0;
// int P2 = 0;
// int P3 = 0;
// int P4 = 0;
int tk_h = 0;
int tk_m = 0;
int tk_s = 0;
......@@ -457,7 +457,8 @@ extern int decode_glostr(const unsigned char* buff, geph_t* geph) {
/* frame 1 */
frn1 = getbitu(buff, i, 4);
i += 4 + 2;
P1 = getbitu(buff, i, 2);
//P1 = getbitu(buff, i, 2);
getbitu(buff, i, 2);
i += 2;
tk_h = getbitu(buff, i, 5);
i += 5;
......@@ -477,7 +478,8 @@ extern int decode_glostr(const unsigned char* buff, geph_t* geph) {
i += 4;
geph->svh = getbitu(buff, i, 3);
i += 3;
P2 = getbitu(buff, i, 1);
//P2 = getbitu(buff, i, 1);
getbitu(buff, i, 1);
i += 1;
tb = getbitu(buff, i, 7);
i += 7 + 5;
......@@ -491,13 +493,16 @@ extern int decode_glostr(const unsigned char* buff, geph_t* geph) {
/* frame 3 */
frn3 = getbitu(buff, i, 4);
i += 4;
P3 = getbitu(buff, i, 1);
//P3 = getbitu(buff, i, 1);
getbitu(buff, i, 1);
i += 1;
geph->gamn = getbitg(buff, i, 11) * P2_40;
i += 11 + 1;
P = getbitu(buff, i, 2);
//P = getbitu(buff, i, 2);
getbitu(buff, i, 2);
i += 2;
int ln = getbitu(buff, i, 1);
//int ln = getbitu(buff, i, 1);
getbitu(buff, i, 1);
i += 1;
geph->vel[2] = getbitg(buff, i, 24) * P2_20 * 1E3;
i += 24;
......@@ -515,15 +520,18 @@ extern int decode_glostr(const unsigned char* buff, geph_t* geph) {
i += 5;
geph->age = getbitu(buff, i, 5);
i += 5 + 14;
P4 = getbitu(buff, i, 1);
//P4 = getbitu(buff, i, 1);
getbitu(buff, i, 1);
i += 1;
geph->sva = getbitu(buff, i, 4);
i += 4 + 3;
int NT = getbitu(buff, i, 11);
//int NT = getbitu(buff, i, 11);
getbitu(buff, i, 11);
i += 11;
slot = getbitu(buff, i, 5);
i += 5;
int M = getbitu(buff, i, 2);
//int M = getbitu(buff, i, 2);
getbitu(buff, i, 2);
if (frn1 != 1 || frn2 != 2 || frn3 != 3 || frn4 != 4) {
trace(3, "decode_glostr error: frn=%d %d %d %d %d\n", frn1, frn2, frn3,
......
......@@ -1232,7 +1232,8 @@ static int decode_type1045(rtcm_t* rtcm) {
eph_t eph = {0};
double toc, sqrtA;
char* msg;
int i = 24 + 12, prn, sat, week, e5a_hs, e5a_dvs, rsv, sys = SYS_GAL;
//int i = 24 + 12, prn, sat, week, e5a_hs, e5a_dvs, rsv, sys = SYS_GAL;
int i = 24 + 12, prn, sat, week, e5a_hs, e5a_dvs, sys = SYS_GAL;
if (i + 484 <= rtcm->len * 8) {
prn = getbitu(rtcm->buff, i, 6);
......@@ -1289,7 +1290,8 @@ static int decode_type1045(rtcm_t* rtcm) {
i += 2; /* OSHS */
e5a_dvs = getbitu(rtcm->buff, i, 1);
i += 1; /* OSDVS */
rsv = getbitu(rtcm->buff, i, 7);
//rsv = getbitu(rtcm->buff, i, 7);
getbitu(rtcm->buff, i, 7);
} else {
trace(2, "rtcm3 1045 length error: len=%d\n", rtcm->len);
return -1;
......@@ -2185,7 +2187,8 @@ static int decode_msm_head(rtcm_t* rtcm, int sys, int* sync, int* iod,
msm_h_t h0 = {0};
double tow, tod;
char* msg;
int i = 24, j, dow, mask, staid, type, ncell = 0;
//int i = 24, j, dow, mask, staid, type, ncell = 0;
int i = 24, j, mask, staid, type, ncell = 0;
type = getbitu(rtcm->buff, i, 12);
i += 12;
......@@ -2196,7 +2199,8 @@ static int decode_msm_head(rtcm_t* rtcm, int sys, int* sync, int* iod,
i += 12;
if (sys == SYS_GLO) {
dow = getbitu(rtcm->buff, i, 3);
//dow = getbitu(rtcm->buff, i, 3);
getbitu(rtcm->buff, i, 3);
i += 3;
tod = getbitu(rtcm->buff, i, 27) * 0.001;
i += 27;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册