Merge pull request Hamlib#1708 from GeoBaltz/fix27

N0NB · web-flow · commit 9aed2637a63a · 2025-04-21T17:27:29.000-05:00
Minor fixes/cleanups for 4.6.3
diff --git a/NEWS b/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) 
diff --git a/rigs/kenwood/ts890s.c b/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,
diff --git a/tests/ampctl.c b/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)
         {
diff --git a/tests/ampctld.c b/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)
         {
diff --git a/tests/rigctl.c b/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)
         {
diff --git a/tests/rigctld.c b/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)
         {
diff --git a/tests/rigmem.c b/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;
 
diff --git a/tests/rigswr.c b/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;
 
diff --git a/tests/rotctl.c b/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)
         {
diff --git a/tests/rotctld.c b/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)
         {

Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ int main(int argc, char *argv[])`
`315`	`315`	`continue;`
`316`	`316`	`}`
`317`	`317`
`318`		`- retcode = amp_set_conf(my_amp, amp_token_lookup(my_amp, mytoken), myvalue);`
	`318`	`+ retcode = amp_set_conf(my_amp, lookup, myvalue);`
`319`	`319`
`320`	`320`	`if (retcode != RIG_OK)`
`321`	`321`	`{`
Original file line number	Diff line number	Diff line change
`@@ -340,7 +340,7 @@ int main(int argc, char *argv[])`
`340`	`340`	`continue;`
`341`	`341`	`}`
`342`	`342`
`343`		`- retcode = amp_set_conf(my_amp, amp_token_lookup(my_amp, mytoken), myvalue);`
	`343`	`+ retcode = amp_set_conf(my_amp, lookup, myvalue);`
`344`	`344`
`345`	`345`	`if (retcode != RIG_OK)`
`346`	`346`	`{`
Original file line number	Diff line number	Diff line change
`@@ -585,7 +585,7 @@ int main(int argc, char *argv[])`
`585`	`585`	`continue;`
`586`	`586`	`}`
`587`	`587`
`588`		`- retcode = rig_set_conf(my_rig, rig_token_lookup(my_rig, mytoken), myvalue);`
	`588`	`+ retcode = rig_set_conf(my_rig, lookup, myvalue);`
`589`	`589`
`590`	`590`	`if (retcode != RIG_OK)`
`591`	`591`	`{`
Original file line number	Diff line number	Diff line change
`@@ -681,7 +681,7 @@ int main(int argc, char *argv[])`
`681`	`681`	`continue;`
`682`	`682`	`}`
`683`	`683`
`684`		`- retcode = rig_set_conf(my_rig, rig_token_lookup(my_rig, mytoken), myvalue);`
	`684`	`+ retcode = rig_set_conf(my_rig, lookup, myvalue);`
`685`	`685`
`686`	`686`	`if (retcode != RIG_OK)`
`687`	`687`	`{`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ extern int csv_parm_load(RIG rig, const char infilename);`
`55`	`55`	`*/`
`56`	`56`	`void usage();`
`57`	`57`	`void version();`
`58`		`-int set_conf(RIG rig, char conf_parms);`
	`58`	`+static int set_conf(RIG rig, char conf_parms);`
`59`	`59`
`60`	`60`	`int clear_chans(RIG rig, const char infilename);`
`61`	`61`
`@@ -442,7 +442,7 @@ void usage()`
`442`	`442`	`}`
`443`	`443`
`444`	`444`
`445`		`-int set_conf(RIG rig, char conf_parms)`
	`445`	`+static int set_conf(RIG rig, char conf_parms)`
`446`	`446`	`{`
`447`	`447`	`char p, n;`
`448`	`448`
Original file line number	Diff line number	Diff line change
`@@ -374,7 +374,7 @@ void usage()`
`374`	`374`	`}`
`375`	`375`
`376`	`376`
`377`		`-int set_conf(RIG rig, char conf_parms)`
	`377`	`+static int set_conf(RIG rig, char conf_parms)`
`378`	`378`	`{`
`379`	`379`	`char p, n;`
`380`	`380`
Original file line number	Diff line number	Diff line change
`@@ -355,7 +355,7 @@ int main(int argc, char *argv[])`
`355`	`355`	`continue;`
`356`	`356`	`}`
`357`	`357`
`358`		`- retcode = rot_set_conf(my_rot, rot_token_lookup(my_rot, mytoken), myvalue);`
	`358`	`+ retcode = rot_set_conf(my_rot, lookup, myvalue);`
`359`	`359`
`360`	`360`	`if (retcode != RIG_OK)`
`361`	`361`	`{`
Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,7 @@ int main(int argc, char *argv[])`
`363`	`363`	`continue;`
`364`	`364`	`}`
`365`	`365`
`366`		`- retcode = rot_set_conf(my_rot, rot_token_lookup(my_rot, mytoken), myvalue);`
	`366`	`+ retcode = rot_set_conf(my_rot, lookup, myvalue);`
`367`	`367`
`368`	`368`	`if (retcode != RIG_OK)`
`369`	`369`	`{`