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

Remove duplication across GPIO and GPION handling of PTT and DCD

pull/191/head
Bill Somerville 2020-01-26 14:46:21 +00:00
rodzic 6573a283a8
commit be0f371bde
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: D864B06D1E81618F
1 zmienionych plików z 4 dodań i 40 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

44
src/rig.c
Wyświetl plik

@ -690,31 +690,12 @@ int HAMLIB_API rig_open(RIG *rig)
break; break;
case RIG_PTT_GPIO: case RIG_PTT_GPIO:
rs->pttport.fd = gpio_open(&rs->pttport, 1, 1);
if (rs->pttport.fd < 0)
{
rig_debug(RIG_DEBUG_ERR,
"%s: cannot open PTT device \"%s\"\n",
__func__,
rs->pttport.pathname);
status = -RIG_EIO;
}
else
{
gpio_ptt_set(&rs->pttport, RIG_PTT_OFF);
gpio_close(&rs->pttport);
}
break;
case RIG_PTT_GPION: case RIG_PTT_GPION:
rs->pttport.fd = gpio_open(&rs->pttport, 1, 0); rs->pttport.fd = gpio_open(&rs->pttport, 1, RIG_PTT_GPION == rs->pttport.type.ptt ? 0 : 1);
if (rs->pttport.fd < 0) if (rs->pttport.fd < 0)
{ {
rig_debug(RIG_DEBUG_ERR, rig_debug(RIG_DEBUG_ERR,
"%s: cannot open PTT device \"%s\"\n", "%s: cannot open PTT device \"GPIO%s\"\n",
__func__, __func__,
rs->pttport.pathname); rs->pttport.pathname);
status = -RIG_EIO; status = -RIG_EIO;
@ -785,29 +766,12 @@ int HAMLIB_API rig_open(RIG *rig)
break; break;
case RIG_DCD_GPIO: case RIG_DCD_GPIO:
rs->dcdport.fd = gpio_open(&rs->dcdport, 0, 1);
if (rs->dcdport.fd < 0)
{
rig_debug(RIG_DEBUG_ERR,
"%s: cannot open DCD device \"%s\"\n",
__func__,
rs->dcdport.pathname);
status = -RIG_EIO;
}
else {
gpio_close(&rs->dcdport);
}
break;
case RIG_DCD_GPION: case RIG_DCD_GPION:
rs->dcdport.fd = gpio_open(&rs->dcdport, 0, 0); rs->dcdport.fd = gpio_open(&rs->dcdport, 0, RIG_DCD_GPION == rs->dcdport.type.dcd ? 0 : 1);
if (rs->dcdport.fd < 0) if (rs->dcdport.fd < 0)
{ {
rig_debug(RIG_DEBUG_ERR, rig_debug(RIG_DEBUG_ERR,
"%s: cannot open DCD device \"%s\"\n", "%s: cannot open DCD device \"GPIO%s\"\n",
__func__, __func__,
rs->dcdport.pathname); rs->dcdport.pathname);
status = -RIG_EIO; status = -RIG_EIO;