kopia lustrzana https://github.com/Hamlib/Hamlib
check ITU region validity in rig_set_conf('itu_region')
git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@2357 7ae35d74-ebe9-4afe-98af-79ac388436b8Hamlib-1.2.8
rodzic
8e96f2812c
commit
35e2e248c7
14
src/conf.c
14
src/conf.c
|
@ -13,7 +13,7 @@
|
||||||
* Hamlib Interface - configuration interface
|
* Hamlib Interface - configuration interface
|
||||||
* Copyright (c) 2000-2006 by Stephane Fillod
|
* Copyright (c) 2000-2006 by Stephane Fillod
|
||||||
*
|
*
|
||||||
* $Id: conf.c,v 1.16 2008-04-09 21:36:06 fillods Exp $
|
* $Id: conf.c,v 1.17 2008-05-08 12:40:04 fillods Exp $
|
||||||
*
|
*
|
||||||
* This library is free software; you can redistribute it and/or modify
|
* This library is free software; you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU Library General Public License as
|
* it under the terms of the GNU Library General Public License as
|
||||||
|
@ -122,6 +122,7 @@ static int frontend_set_conf(RIG *rig, token_t token, const char *val)
|
||||||
{
|
{
|
||||||
const struct rig_caps *caps;
|
const struct rig_caps *caps;
|
||||||
struct rig_state *rs;
|
struct rig_state *rs;
|
||||||
|
int val_i;
|
||||||
|
|
||||||
caps = rig->caps;
|
caps = rig->caps;
|
||||||
rs = &rig->state;
|
rs = &rig->state;
|
||||||
|
@ -210,9 +211,10 @@ static int frontend_set_conf(RIG *rig, token_t token, const char *val)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case TOK_ITU_REGION:
|
case TOK_ITU_REGION:
|
||||||
rs->itu_region = atoi(val);
|
val_i = atoi(val);
|
||||||
switch(rs->itu_region) {
|
switch(val_i) {
|
||||||
case RIG_ITU_REGION1:
|
case RIG_ITU_REGION1:
|
||||||
|
rs->itu_region = val_i;
|
||||||
memcpy(rs->tx_range_list, caps->tx_range_list1,
|
memcpy(rs->tx_range_list, caps->tx_range_list1,
|
||||||
sizeof(struct freq_range_list)*FRQRANGESIZ);
|
sizeof(struct freq_range_list)*FRQRANGESIZ);
|
||||||
memcpy(rs->rx_range_list, caps->rx_range_list1,
|
memcpy(rs->rx_range_list, caps->rx_range_list1,
|
||||||
|
@ -220,13 +222,15 @@ static int frontend_set_conf(RIG *rig, token_t token, const char *val)
|
||||||
break;
|
break;
|
||||||
case RIG_ITU_REGION2:
|
case RIG_ITU_REGION2:
|
||||||
case RIG_ITU_REGION3:
|
case RIG_ITU_REGION3:
|
||||||
default:
|
rs->itu_region = val_i;
|
||||||
memcpy(rs->tx_range_list, caps->tx_range_list2,
|
memcpy(rs->tx_range_list, caps->tx_range_list2,
|
||||||
sizeof(struct freq_range_list)*FRQRANGESIZ);
|
sizeof(struct freq_range_list)*FRQRANGESIZ);
|
||||||
memcpy(rs->rx_range_list, caps->rx_range_list2,
|
memcpy(rs->rx_range_list, caps->rx_range_list2,
|
||||||
sizeof(struct freq_range_list)*FRQRANGESIZ);
|
sizeof(struct freq_range_list)*FRQRANGESIZ);
|
||||||
break;
|
break;
|
||||||
}
|
default:
|
||||||
|
return -RIG_EINVAL;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case TOK_VFO_COMP:
|
case TOK_VFO_COMP:
|
||||||
|
|
Ładowanie…
Reference in New Issue