make use of factorized rig_lookup_mem_caps

git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@2334 7ae35d74-ebe9-4afe-98af-79ac388436b8
Hamlib-1.2.8
Stéphane Fillod, F8CFE 2008-04-27 09:57:04 +00:00
rodzic d5d2736642
commit db1b660205
1 zmienionych plików z 6 dodań i 12 usunięć

Wyświetl plik

@ -5,7 +5,7 @@
* It takes commands in interactive mode as well as * It takes commands in interactive mode as well as
* from command line options. * from command line options.
* *
* $Id: rigctl_parse.c,v 1.4 2008-01-12 00:36:58 n0nb Exp $ * $Id: rigctl_parse.c,v 1.5 2008-04-27 09:57:04 fillods Exp $
* *
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -1293,9 +1293,8 @@ declare_proto_rig(scan)
/* 'H' */ /* 'H' */
declare_proto_rig(set_channel) declare_proto_rig(set_channel)
{ {
channel_cap_t *mem_caps = NULL; const channel_cap_t *mem_caps = NULL;
chan_t *chan_list; const chan_t *chan_list;
int i;
channel_t chan; channel_t chan;
return -RIG_ENIMPL; return -RIG_ENIMPL;
@ -1307,14 +1306,9 @@ declare_proto_rig(set_channel)
/* /*
* find mem_caps in caps, we'll need it later * find mem_caps in caps, we'll need it later
*/ */
chan_list = rig->caps->chan_list; chan_list = rig_lookup_mem_caps(rig, chan.channel_num);
for (i=0; i<CHANLSTSIZ && !RIG_IS_CHAN_END(chan_list[i]); i++) { if (chan_list)
if (chan.channel_num >= chan_list[i].start && mem_caps = &chan_list->mem_caps;
chan.channel_num <= chan_list[i].end) {
mem_caps = &chan_list[i].mem_caps;
break;
}
}
} else { } else {
chan.vfo = rig_parse_vfo(arg1); chan.vfo = rig_parse_vfo(arg1);