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

64 bit mods to netrigctl.c testrig.c

pull/72/head
Michael Black 2018-12-21 23:51:54 -05:00
rodzic 160c8f015d
commit 2b5f01fb75
2 zmienionych plików z 11 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

16
dummy/netrigctl.c
Wyświetl plik

@ -113,10 +113,10 @@ static int netrigctl_open(RIG *rig)
if (ret <= 0)
return (ret < 0) ? ret : -RIG_EPROTO;
ret = num_sscanf(buf, "%"SCNfreq"%"SCNfreq"%llx%d%d%x%x",
ret = num_sscanf(buf, "%"SCNfreq"%"SCNfreq"%"SCNXll"%d%d%x%x",
&rs->rx_range_list[i].start,
&rs->rx_range_list[i].end,
&rs->rx_range_list[i].modes,
(uint64_t*)&rs->rx_range_list[i].modes,
&rs->rx_range_list[i].low_power,
&rs->rx_range_list[i].high_power,
&rs->rx_range_list[i].vfo,
@ -132,10 +132,10 @@ static int netrigctl_open(RIG *rig)
if (ret <= 0)
return (ret < 0) ? ret : -RIG_EPROTO;
ret = num_sscanf(buf, "%"SCNfreq"%"SCNfreq"%llx%d%d%x%x",
ret = num_sscanf(buf, "%"SCNfreq"%"SCNfreq"%"SCNXll"%d%d%x%x",
&rs->tx_range_list[i].start,
&rs->tx_range_list[i].end,
&rs->tx_range_list[i].modes,
(uint64_t*)&rs->tx_range_list[i].modes,
&rs->tx_range_list[i].low_power,
&rs->tx_range_list[i].high_power,
&rs->tx_range_list[i].vfo,
@ -151,8 +151,8 @@ static int netrigctl_open(RIG *rig)
if (ret <= 0)
return (ret < 0) ? ret : -RIG_EPROTO;
ret = sscanf(buf, "%llx%ld",
&rs->tuning_steps[i].modes,
ret = sscanf(buf, "%"SCNXll"%ld",
(uint64_t*)&rs->tuning_steps[i].modes,
&rs->tuning_steps[i].ts);
if (ret != 2)
return -RIG_EPROTO;
@ -165,8 +165,8 @@ static int netrigctl_open(RIG *rig)
if (ret <= 0)
return (ret < 0) ? ret : -RIG_EPROTO;
ret = sscanf(buf, "%llx%ld",
&rs->filters[i].modes,
ret = sscanf(buf, "%"SCNXll"%ld",
(uint64_t*)&rs->filters[i].modes,
&rs->filters[i].width);
if (ret != 2)
return -RIG_EPROTO;

4
tests/testrig.c
Wyświetl plik

@ -9,6 +9,8 @@
#include <hamlib/rig.h>
#include "misc.h"
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
@ -401,7 +403,7 @@ int main(int argc, char *argv[])
if (retcode == RIG_OK)
{
printf("rig_get_mode: mode = %i \n", rmode);
printf("rig_get_mode: mode = %"PRIll"\n", rmode);
}
else
{