Merge pull request #1708 from GeoBaltz/fix27

Minor fixes/cleanups for 4.6.3

NEWS

@@ -17,12 +17,14 @@ Version 4.6.3
         * Add rig CODAN 2110
 
 Version 4.6.2
+        * 2025-02-09
         * Add missing levels for IC746/PRO RIG_LEVEL_RFPOWER_METER,RIG_LEVEL_RFPOWER_METER_WATTS,RIG_LEVEL_SWR,RIG_LEVEL_ALC
         * Fix IC905 for gpredict
         * Fix potential segfault on QMX 
         * Fix pmr171
         
 Version 4.6.1
+        * 2025-01-21
         * Fix C++ builds failing on rig_list_foreach function
         * Fix IC9100 rigctld startup to end up on VFOA
         * Fix grig build by removing sys/socket.h -- apparently not needed
@@ -34,6 +36,7 @@ Version 4.6.1
         * Fix SDRConsole by removing lots of things it does not have
 
 Version 4.6
+        * 2024-12-24
 	* send_raw can now take hex digits as colon-separated -- e.g. send_raw icom xfe:xfe:x94:xe0:03:xfd
 	* Add IC7760
         * IC7300 Mode filter can now be set by # (i.e. 1,2,3) 

rigs/kenwood/ts890s.c

@@ -669,6 +669,7 @@ struct rig_caps ts890s_caps =
     .get_mode = kenwood_get_mode,
     .set_vfo = kenwood_set_vfo,
     .get_vfo = kenwood_get_vfo_if,
+    .vfo_op = kenwood_vfo_op,
     .set_split_vfo = kenwood_set_split_vfo,
     .get_split_vfo = ts890s_get_split_vfo,
     .set_ctcss_tone = kenwood_set_ctcss_tone_tn,

tests/ampctl.c

@@ -315,7 +315,7 @@ int main(int argc, char *argv[])
             continue;
         }
 
-        retcode = amp_set_conf(my_amp, amp_token_lookup(my_amp, mytoken), myvalue);
+        retcode = amp_set_conf(my_amp, lookup, myvalue);
 
         if (retcode != RIG_OK)
         {

tests/ampctld.c

@@ -340,7 +340,7 @@ int main(int argc, char *argv[])
             continue;
         }
 
-        retcode = amp_set_conf(my_amp, amp_token_lookup(my_amp, mytoken), myvalue);
+        retcode = amp_set_conf(my_amp, lookup, myvalue);
 
         if (retcode != RIG_OK)
         {

tests/rigctl.c

@@ -585,7 +585,7 @@ int main(int argc, char *argv[])
             continue;
         }
 
-        retcode = rig_set_conf(my_rig, rig_token_lookup(my_rig, mytoken), myvalue);
+        retcode = rig_set_conf(my_rig, lookup, myvalue);
 
         if (retcode != RIG_OK)
         {

tests/rigctld.c

@@ -681,7 +681,7 @@ int main(int argc, char *argv[])
             continue;
         }
 
-        retcode = rig_set_conf(my_rig, rig_token_lookup(my_rig, mytoken), myvalue);
+        retcode = rig_set_conf(my_rig, lookup, myvalue);
 
         if (retcode != RIG_OK)
         {

tests/rigmem.c

@@ -55,7 +55,7 @@ extern int csv_parm_load(RIG *rig, const char *infilename);
  */
 void usage();
 void version();
-int set_conf(RIG *rig, char *conf_parms);
+static int set_conf(RIG *rig, char *conf_parms);
 
 int clear_chans(RIG *rig, const char *infilename);
 
@@ -442,7 +442,7 @@ void usage()
 }
 
 
-int set_conf(RIG *rig, char *conf_parms)
+static int set_conf(RIG *rig, char *conf_parms)
 {
     char *p, *n;
 

tests/rigswr.c

@@ -374,7 +374,7 @@ void usage()
 }
 
 
-int set_conf(RIG *rig, char *conf_parms)
+static int set_conf(RIG *rig, char *conf_parms)
 {
     char *p, *n;
 

tests/rotctl.c

@@ -355,7 +355,7 @@ int main(int argc, char *argv[])
             continue;
         }
 
-        retcode = rot_set_conf(my_rot, rot_token_lookup(my_rot, mytoken), myvalue);
+        retcode = rot_set_conf(my_rot, lookup, myvalue);
 
         if (retcode != RIG_OK)
         {

tests/rotctld.c

@@ -363,7 +363,7 @@ int main(int argc, char *argv[])
             continue;
         }
 
-        retcode = rot_set_conf(my_rot, rot_token_lookup(my_rot, mytoken), myvalue);
+        retcode = rot_set_conf(my_rot, lookup, myvalue);
 
         if (retcode != RIG_OK)
         {