mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Remove set but unused variable errors in kenwood.

Hamlib-1.2.15
Nate Bargmann 2011-08-25 10:32:25 -05:00
rodzic e78f9be94e
commit 250efe9605
5 zmienionych plików z 88 dodań i 28 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

9
kenwood/ic10.c
Wyświetl plik

@ -661,7 +661,11 @@ int ic10_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
int cmdlen, fct_len, ack_len;
switch (func) {
case RIG_FUNC_LOCK: cmdlen = sprintf(cmdbuf,"LK"); break;
case RIG_FUNC_LOCK:
cmdlen = sprintf(cmdbuf,"LK");
if (cmdlen < 0)
return -RIG_ETRUNC;
break;
default:
rig_debug(RIG_DEBUG_ERR,"%s: Unsupported set_func %#x",
__func__,func);
@ -669,6 +673,9 @@ int ic10_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
}
fct_len = sprintf(fctbuf,"%s%c;", cmdbuf, status==0?'0':'1');
if (fct_len < 0)
return -RIG_ETRUNC;
return ic10_transaction (rig, fctbuf, fct_len, ackbuf, &ack_len);
return RIG_OK;

3
kenwood/th.c
Wyświetl plik

@ -1063,7 +1063,6 @@ th_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
int th_set_level (RIG *rig, vfo_t vfo, setting_t level, value_t val)
{
char vch, buf[12];
size_t ack_len;
vfo_t tvfo;
rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __func__);
@ -1083,8 +1082,6 @@ int th_set_level (RIG *rig, vfo_t vfo, setting_t level, value_t val)
return kenwood_wrong_vfo(__func__, vfo);
}
ack_len = ACKBUF_LEN;
switch (level) {
case RIG_LEVEL_RFPOWER :

3
kenwood/tmv7.c
Wyświetl plik

@ -554,9 +554,8 @@ int tmv7_set_channel(RIG *rig, const channel_t *chan)
size_t ack_len;
char req[64];
long freq;
int chn, step, shift, tone, ctcss, tonefq, ctcssfq;
int step, shift, tone, ctcss, tonefq, ctcssfq;
chn=chan->channel_num;
freq=(long)chan->freq;
for(step=0; rig->state.tuning_steps[step].ts!=0;step++)

61
kenwood/ts570.c
Wyświetl plik

@ -453,6 +453,9 @@ int ts570_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t txvfo)
}
/* set RX VFO */
cmd_len = sprintf(cmdbuf, "FR%c%c", vfo_function, cmd_trm(rig));
if (cmd_len < 0)
return -RIG_ETRUNC;
retval = kenwood_simple_cmd(rig, cmdbuf);
if (retval != RIG_OK)
return retval;
@ -470,6 +473,9 @@ int ts570_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t txvfo)
}
/* set TX VFO */
cmd_len = sprintf(cmdbuf, "FT%c%c", vfo_function, cmd_trm(rig));
if (cmd_len < 0)
return -RIG_ETRUNC;
retval = kenwood_simple_cmd(rig, cmdbuf);
if (retval != RIG_OK)
return retval;
@ -485,6 +491,9 @@ int ts570_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t txvfo)
/* and then set it to both vfo's */
vfo_function = ackbuf[2];
cmd_len = sprintf(cmdbuf, "FT%c%c", vfo_function, cmd_trm(rig));
if (cmd_len < 0)
return -RIG_ETRUNC;
retval = kenwood_simple_cmd(rig, cmdbuf);
if (retval != RIG_OK)
return retval;
@ -511,7 +520,7 @@ int ts570_set_channel (RIG * rig, const channel_t * chan)
int retval, cmd_len;
size_t mem_len;
int num,freq,tx_freq,tone;
char mode,tx_mode,split,tones;
char mode,tx_mode,tones;
num=chan->channel_num;
freq=(int)chan->freq;
@ -519,11 +528,9 @@ int ts570_set_channel (RIG * rig, const channel_t * chan)
if(chan->split==RIG_SPLIT_ON) {
tx_freq=(int)chan->tx_freq;
tx_mode=mode_to_char(chan->tx_mode);
split='1';
} else {
tx_freq=0;
tx_mode='\0';
split='0';
}
for (tone = 1; rig->caps->ctcss_list[tone-1] != 0 && tone<39; tone++) {
@ -539,6 +546,9 @@ int ts570_set_channel (RIG * rig, const channel_t * chan)
cmd_len = sprintf(cmdbuf, "MW0 %02d%011d%c0%c%02d ",
num,freq,mode,tones,tone);
if (cmd_len < 0)
return -RIG_ETRUNC;
mem_len = 0;
retval = kenwood_transaction (rig, cmdbuf, cmd_len, membuf, &mem_len);
if (retval != RIG_OK)
@ -546,6 +556,9 @@ int ts570_set_channel (RIG * rig, const channel_t * chan)
cmd_len = sprintf(cmdbuf, "MW1 %02d%011d%c0%c%02d ",
num,tx_freq,tx_mode,tones,tone);
if (cmd_len < 0)
return -RIG_ETRUNC;
mem_len = 0;
retval = kenwood_transaction (rig, cmdbuf, cmd_len, membuf, &mem_len);
if (retval != RIG_OK)
@ -589,23 +602,36 @@ int ts570_set_rit(RIG * rig, vfo_t vfo, shortfreq_t rit)
info_len = 0;
if (rit == 0) {
kenwood_transaction(rig, "RT0", 3, infobuf, &info_len);
return RIG_OK;
} else
kenwood_transaction(rig, "RT1", 3, infobuf, &info_len);
retval = kenwood_transaction(rig, "RT0", 3, infobuf, &info_len);
if (retval != RIG_OK)
return retval;
else
return RIG_OK;
} else {
retval = kenwood_transaction(rig, "RT1", 3, infobuf, &info_len);
if (retval != RIG_OK)
return retval;
}
if (rit > 0)
c = 'U';
else
c = 'D';
len = sprintf(buf, "R%c", c);
if (len < 0)
return -RIG_ETRUNC;
info_len = 0;
retval = kenwood_transaction(rig, "RC", 2, infobuf, &info_len);
if (retval != RIG_OK)
return retval;
for (i = 0; i < abs(rint(rit/10)); i++)
{
info_len = 0;
retval = kenwood_transaction(rig, buf, len, infobuf, &info_len);
if (retval != RIG_OK)
return retval;
}
return RIG_OK;
@ -620,23 +646,36 @@ int ts570_set_xit(RIG * rig, vfo_t vfo, shortfreq_t rit)
info_len = 0;
if (rit == 0) {
kenwood_transaction(rig, "XT0", 3, infobuf, &info_len);
return RIG_OK;
} else
kenwood_transaction(rig, "XT1", 3, infobuf, &info_len);
retval = kenwood_transaction(rig, "XT0", 3, infobuf, &info_len);
if (retval != RIG_OK)
return retval;
else
return RIG_OK;
} else {
retval = kenwood_transaction(rig, "XT1", 3, infobuf, &info_len);
if (retval != RIG_OK)
return retval;
}
if (rit > 0)
c = 'U';
else
c = 'D';
len = sprintf(buf, "R%c", c);
if (len < 0)
return -RIG_ETRUNC;
info_len = 0;
retval = kenwood_transaction(rig, "RC", 2, infobuf, &info_len);
if (retval != RIG_OK)
return retval;
for (i = 0; i < abs(rint(rit/10)); i++)
{
info_len = 0;
retval = kenwood_transaction(rig, buf, len, infobuf, &info_len);
if (retval != RIG_OK)
return retval;
}
return RIG_OK;

40
kenwood/ts850.c
Wyświetl plik

@ -248,10 +248,15 @@ int ts850_set_rit(RIG * rig, vfo_t vfo, shortfreq_t rit)
size_t info_len;
info_len = 0;
if (rit == 0)
kenwood_transaction(rig, "RT0", 3, infobuf, &info_len);
else
kenwood_transaction(rig, "RT1", 3, infobuf, &info_len);
if (rit == 0) {
retval = kenwood_transaction(rig, "RT0", 3, infobuf, &info_len);
if (retval != RIG_OK)
return retval;
} else {
retval = kenwood_transaction(rig, "RT1", 3, infobuf, &info_len);
if (retval != RIG_OK)
return retval;
}
if (rit > 0)
c = 'U';
@ -261,10 +266,15 @@ int ts850_set_rit(RIG * rig, vfo_t vfo, shortfreq_t rit)
info_len = 0;
retval = kenwood_transaction(rig, "RC", 2, infobuf, &info_len);
if (retval != RIG_OK)
return retval;
for (i = 0; i < abs(rint(rit/20)); i++)
{
info_len = 0;
retval = kenwood_transaction(rig, buf, len, infobuf, &info_len);
if (retval != RIG_OK)
return retval;
}
return RIG_OK;
@ -278,13 +288,21 @@ int ts850_set_xit(RIG * rig, vfo_t vfo, shortfreq_t xit)
size_t info_len;
info_len = 0;
if (xit == 0)
kenwood_transaction(rig, "XT0", 3, infobuf, &info_len);
else
kenwood_transaction(rig, "XT1", 3, infobuf, &info_len);
if (xit == 0) {
retval = kenwood_transaction(rig, "XT0", 3, infobuf, &info_len);
if (retval != RIG_OK)
return retval;
} else {
retval = kenwood_transaction(rig, "XT1", 3, infobuf, &info_len);
if (retval != RIG_OK)
return retval;
}
info_len = 0;
retval = kenwood_transaction(rig, "RC", 2, infobuf, &info_len);
if (retval != RIG_OK)
return retval;
if (xit > 0)
c = 'U';
else
@ -295,6 +313,8 @@ int ts850_set_xit(RIG * rig, vfo_t vfo, shortfreq_t xit)
{
info_len = 0;
retval = kenwood_transaction(rig, buf, len, infobuf, &info_len);
if (retval != RIG_OK)
return retval;
}
return RIG_OK;
@ -413,7 +433,7 @@ int ts850_set_channel (RIG * rig, const channel_t * chan)
int retval, cmd_len;
size_t mem_len;
int num,freq,tx_freq,tone;
char mode,tx_mode,split,tones;
char mode,tx_mode,tones;
num=chan->channel_num;
freq=(int)chan->freq;
@ -421,11 +441,9 @@ int ts850_set_channel (RIG * rig, const channel_t * chan)
if(chan->split==RIG_SPLIT_ON) {
tx_freq=(int)chan->tx_freq;
tx_mode=mode_to_char(chan->tx_mode);
split='1';
} else {
tx_freq=0;
tx_mode='\0';
split='0';
}
for (tone = 1; rig->caps->ctcss_list[tone-1] != 0 && tone<39; tone++) {