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

Add some more copies to port_deprecated structures for rigctl and rigctld

pull/976/head
Mike Black W9MDB 2022-02-05 23:25:02 -06:00
rodzic 5976e6a65f
commit 6f486e69d6
2 zmienionych plików z 12 dodań i 0 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
tests/rigctl.c
Wyświetl plik

@ -203,6 +203,7 @@ int main(int argc, char *argv[])
} }
rig_file = optarg; rig_file = optarg;
rig_debug(RIG_DEBUG_VERBOSE, "%s: rig_file=%s\n", __func__, rig_file);
break; break;
case 'p': case 'p':
@ -485,6 +486,7 @@ int main(int argc, char *argv[])
if (rig_file) if (rig_file)
{ {
strncpy(my_rig->state.rigport.pathname, rig_file, HAMLIB_FILPATHLEN - 1); strncpy(my_rig->state.rigport.pathname, rig_file, HAMLIB_FILPATHLEN - 1);
strncpy(my_rig->state.rigport_deprecated.pathname, rig_file, HAMLIB_FILPATHLEN - 1);
} }
/* /*
@ -493,27 +495,32 @@ int main(int argc, char *argv[])
if (ptt_type != RIG_PTT_NONE) if (ptt_type != RIG_PTT_NONE)
{ {
my_rig->state.pttport.type.ptt = ptt_type; my_rig->state.pttport.type.ptt = ptt_type;
my_rig->state.pttport_deprecated.type.ptt = ptt_type;
} }
if (dcd_type != RIG_DCD_NONE) if (dcd_type != RIG_DCD_NONE)
{ {
my_rig->state.dcdport.type.dcd = dcd_type; my_rig->state.dcdport.type.dcd = dcd_type;
my_rig->state.dcdport_deprecated.type.dcd = dcd_type;
} }
if (ptt_file) if (ptt_file)
{ {
strncpy(my_rig->state.pttport.pathname, ptt_file, HAMLIB_FILPATHLEN - 1); strncpy(my_rig->state.pttport.pathname, ptt_file, HAMLIB_FILPATHLEN - 1);
strncpy(my_rig->state.pttport_deprecated.pathname, ptt_file, HAMLIB_FILPATHLEN - 1);
} }
if (dcd_file) if (dcd_file)
{ {
strncpy(my_rig->state.dcdport.pathname, dcd_file, HAMLIB_FILPATHLEN - 1); strncpy(my_rig->state.dcdport.pathname, dcd_file, HAMLIB_FILPATHLEN - 1);
strncpy(my_rig->state.dcdport_deprecated.pathname, dcd_file, HAMLIB_FILPATHLEN - 1);
} }
/* FIXME: bound checking and port type == serial */ /* FIXME: bound checking and port type == serial */
if (serial_rate != 0) if (serial_rate != 0)
{ {
my_rig->state.rigport.parm.serial.rate = serial_rate; my_rig->state.rigport.parm.serial.rate = serial_rate;
my_rig->state.rigport_deprecated.parm.serial.rate = serial_rate;
} }
if (civaddr) if (civaddr)

5
tests/rigctld.c
Wyświetl plik

@ -641,27 +641,32 @@ int main(int argc, char *argv[])
if (ptt_type != RIG_PTT_NONE) if (ptt_type != RIG_PTT_NONE)
{ {
my_rig->state.pttport.type.ptt = ptt_type; my_rig->state.pttport.type.ptt = ptt_type;
my_rig->state.pttport_deprecated.type.ptt = ptt_type;
} }
if (dcd_type != RIG_DCD_NONE) if (dcd_type != RIG_DCD_NONE)
{ {
my_rig->state.dcdport.type.dcd = dcd_type; my_rig->state.dcdport.type.dcd = dcd_type;
my_rig->state.dcdport_deprecated.type.dcd = dcd_type;
} }
if (ptt_file) if (ptt_file)
{ {
strncpy(my_rig->state.pttport.pathname, ptt_file, HAMLIB_FILPATHLEN - 1); strncpy(my_rig->state.pttport.pathname, ptt_file, HAMLIB_FILPATHLEN - 1);
strncpy(my_rig->state.pttport_deprecated.pathname, ptt_file, HAMLIB_FILPATHLEN - 1);
} }
if (dcd_file) if (dcd_file)
{ {
strncpy(my_rig->state.dcdport.pathname, dcd_file, HAMLIB_FILPATHLEN - 1); strncpy(my_rig->state.dcdport.pathname, dcd_file, HAMLIB_FILPATHLEN - 1);
strncpy(my_rig->state.dcdport_deprecated.pathname, dcd_file, HAMLIB_FILPATHLEN - 1);
} }
/* FIXME: bound checking and port type == serial */ /* FIXME: bound checking and port type == serial */
if (serial_rate != 0) if (serial_rate != 0)
{ {
my_rig->state.rigport.parm.serial.rate = serial_rate; my_rig->state.rigport.parm.serial.rate = serial_rate;
my_rig->state.rigport_deprecated.parm.serial.rate = serial_rate;
} }
if (civaddr) if (civaddr)