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

Be careful, rs->rigport.parm is an union, so serial fields should be 

accessed only for the RIG_PORT_SERIAL type.


git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@2314 7ae35d74-ebe9-4afe-98af-79ac388436b8
Hamlib-1.2.7.1
Stéphane Fillod, F8CFE 2008-04-09 21:36:06 +00:00
rodzic 47d1f4687e
commit 4ab3d5371f
2 zmienionych plików z 50 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

30
src/conf.c
Wyświetl plik

@ -13,7 +13,7 @@
* Hamlib Interface - configuration interface
* Copyright (c) 2000-2006 by Stephane Fillod
*
* $Id: conf.c,v 1.15 2006-10-15 00:27:51 aa6e Exp $
* $Id: conf.c,v 1.16 2008-04-09 21:36:06 fillods Exp $
*
* This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as
@ -144,15 +144,23 @@ static int frontend_set_conf(RIG *rig, token_t token, const char *val)
break;
case TOK_SERIAL_SPEED:
if (rs->rigport.type.rig != RIG_PORT_SERIAL)
return -RIG_EINVAL;
rs->rigport.parm.serial.rate = atoi(val);
break;
case TOK_DATA_BITS:
if (rs->rigport.type.rig != RIG_PORT_SERIAL)
return -RIG_EINVAL;
rs->rigport.parm.serial.data_bits = atoi(val);
break;
case TOK_STOP_BITS:
if (rs->rigport.type.rig != RIG_PORT_SERIAL)
return -RIG_EINVAL;
rs->rigport.parm.serial.stop_bits = atoi(val);
break;
case TOK_PARITY:
if (rs->rigport.type.rig != RIG_PORT_SERIAL)
return -RIG_EINVAL;
if (!strncmp(val, "None", 8))
rs->rigport.parm.serial.parity = RIG_PARITY_NONE;
else if (!strncmp(val, "Odd", 8))
@ -163,6 +171,8 @@ static int frontend_set_conf(RIG *rig, token_t token, const char *val)
return -RIG_EINVAL;
break;
case TOK_HANDSHAKE:
if (rs->rigport.type.rig != RIG_PORT_SERIAL)
return -RIG_EINVAL;
if (!strncmp(val, "None", 8))
rs->rigport.parm.serial.handshake = RIG_HANDSHAKE_NONE;
else if (!strncmp(val, "XONXOFF", 8))
@ -174,6 +184,8 @@ static int frontend_set_conf(RIG *rig, token_t token, const char *val)
break;
case TOK_RTS_STATE:
if (rs->rigport.type.rig != RIG_PORT_SERIAL)
return -RIG_EINVAL;
if (!strcmp(val, "Unset"))
rs->rigport.parm.serial.rts_state = RIG_SIGNAL_UNSET;
else if (!strcmp(val, "ON"))
@ -185,6 +197,8 @@ static int frontend_set_conf(RIG *rig, token_t token, const char *val)
break;
case TOK_DTR_STATE:
if (rs->rigport.type.rig != RIG_PORT_SERIAL)
return -RIG_EINVAL;
if (!strcmp(val, "Unset"))
rs->rigport.parm.serial.dtr_state = RIG_SIGNAL_UNSET;
else if (!strcmp(val, "ON"))
@ -263,15 +277,23 @@ static int frontend_get_conf(RIG *rig, token_t token, char *val)
rs->itu_region == 1 ? RIG_ITU_REGION1 : RIG_ITU_REGION2);
break;
case TOK_SERIAL_SPEED:
if (rs->rigport.type.rig != RIG_PORT_SERIAL)
return -RIG_EINVAL;
sprintf(val, "%d", rs->rigport.parm.serial.rate);
break;
case TOK_DATA_BITS:
if (rs->rigport.type.rig != RIG_PORT_SERIAL)
return -RIG_EINVAL;
sprintf(val, "%d", rs->rigport.parm.serial.data_bits);
break;
case TOK_STOP_BITS:
if (rs->rigport.type.rig != RIG_PORT_SERIAL)
return -RIG_EINVAL;
sprintf(val, "%d", rs->rigport.parm.serial.stop_bits);
break;
case TOK_PARITY:
if (rs->rigport.type.rig != RIG_PORT_SERIAL)
return -RIG_EINVAL;
switch (rs->rigport.parm.serial.parity) {
case RIG_PARITY_NONE: s = "None"; break;
case RIG_PARITY_ODD: s = "Odd"; break;
@ -281,6 +303,8 @@ static int frontend_get_conf(RIG *rig, token_t token, char *val)
strcpy(val, s);
break;
case TOK_HANDSHAKE:
if (rs->rigport.type.rig != RIG_PORT_SERIAL)
return -RIG_EINVAL;
switch (rs->rigport.parm.serial.handshake) {
case RIG_HANDSHAKE_NONE: s = "None"; break;
case RIG_HANDSHAKE_XONXOFF: s = "XONXOFF"; break;
@ -291,6 +315,8 @@ static int frontend_get_conf(RIG *rig, token_t token, char *val)
break;
case TOK_RTS_STATE:
if (rs->rigport.type.rig != RIG_PORT_SERIAL)
return -RIG_EINVAL;
switch (rs->rigport.parm.serial.rts_state) {
case RIG_SIGNAL_UNSET: s = "Unset"; break;
case RIG_SIGNAL_ON: s = "ON"; break;
@ -301,6 +327,8 @@ static int frontend_get_conf(RIG *rig, token_t token, char *val)
break;
case TOK_DTR_STATE:
if (rs->rigport.type.rig != RIG_PORT_SERIAL)
return -RIG_EINVAL;
switch (rs->rigport.parm.serial.dtr_state) {
case RIG_SIGNAL_UNSET: s = "Unset"; break;
case RIG_SIGNAL_ON: s = "ON"; break;

22
src/rot_conf.c
Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib Interface - rotator configuration interface
* Copyright (c) 2000-2004 by Stephane Fillod
*
* $Id: rot_conf.c,v 1.6 2006-10-15 00:27:52 aa6e Exp $
* $Id: rot_conf.c,v 1.7 2008-04-09 21:36:06 fillods Exp $
*
* This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as
@ -147,15 +147,23 @@ int frontrot_set_conf(ROT *rot, token_t token, const char *val)
break;
case TOK_SERIAL_SPEED:
if (rs->rotport.type.rig != RIG_PORT_SERIAL)
return -RIG_EINVAL;
rs->rotport.parm.serial.rate = atoi(val);
break;
case TOK_DATA_BITS:
if (rs->rotport.type.rig != RIG_PORT_SERIAL)
return -RIG_EINVAL;
rs->rotport.parm.serial.data_bits = atoi(val);
break;
case TOK_STOP_BITS:
if (rs->rotport.type.rig != RIG_PORT_SERIAL)
return -RIG_EINVAL;
rs->rotport.parm.serial.stop_bits = atoi(val);
break;
case TOK_PARITY:
if (rs->rotport.type.rig != RIG_PORT_SERIAL)
return -RIG_EINVAL;
if (!strncmp(val, "None", 8))
rs->rotport.parm.serial.parity = RIG_PARITY_NONE;
else if (!strncmp(val, "Odd", 8))
@ -166,6 +174,8 @@ int frontrot_set_conf(ROT *rot, token_t token, const char *val)
return -RIG_EINVAL;
break;
case TOK_HANDSHAKE:
if (rs->rotport.type.rig != RIG_PORT_SERIAL)
return -RIG_EINVAL;
if (!strncmp(val, "None", 8))
rs->rotport.parm.serial.handshake = RIG_HANDSHAKE_NONE;
else if (!strncmp(val, "XONXOFF", 8))
@ -228,15 +238,23 @@ int frontrot_get_conf(ROT *rot, token_t token, char *val)
sprintf(val, "%d", rs->rotport.retry);
break;
case TOK_SERIAL_SPEED:
if (rs->rotport.type.rig != RIG_PORT_SERIAL)
return -RIG_EINVAL;
sprintf(val, "%d", rs->rotport.parm.serial.rate);
break;
case TOK_DATA_BITS:
if (rs->rotport.type.rig != RIG_PORT_SERIAL)
return -RIG_EINVAL;
sprintf(val, "%d", rs->rotport.parm.serial.data_bits);
break;
case TOK_STOP_BITS:
if (rs->rotport.type.rig != RIG_PORT_SERIAL)
return -RIG_EINVAL;
sprintf(val, "%d", rs->rotport.parm.serial.stop_bits);
break;
case TOK_PARITY:
if (rs->rotport.type.rig != RIG_PORT_SERIAL)
return -RIG_EINVAL;
switch (rs->rotport.parm.serial.parity) {
case RIG_PARITY_NONE: s = "None"; break;
case RIG_PARITY_ODD: s = "Odd"; break;
@ -246,6 +264,8 @@ int frontrot_get_conf(ROT *rot, token_t token, char *val)
strcpy(val, s);
break;
case TOK_HANDSHAKE:
if (rs->rotport.type.rig != RIG_PORT_SERIAL)
return -RIG_EINVAL;
switch (rs->rotport.parm.serial.handshake) {
case RIG_HANDSHAKE_NONE: s = "None"; break;
case RIG_HANDSHAKE_XONXOFF: s = "XONXOFF"; break;