[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. a5ecc6f0b1c6ef17d8f4d
Library to control radio transceivers and receivers
Brought to you by:
n0nb
Menu
▾
▴
[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. a5ecc6f0b1c6ef17d8f4db4e99e341c0b553fdd5
|
From: n0nb <n0...@us...> - 2025-12-06 23:21:38
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Hamlib -- Ham radio control libraries".
The branch, master has been updated
via a5ecc6f0b1c6ef17d8f4db4e99e341c0b553fdd5 (commit)
via b0f73d4ce7160f545814d90a0c13ddab2a61a04b (commit)
via f434746cea6da161e747b3e32bbce518a6183460 (commit)
via 845f60c82ecc72f7e7af6435aa26525e6d3be4b8 (commit)
from a95706d3a588376d68f8521f1178f71e1e1fdea4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a5ecc6f0b1c6ef17d8f4db4e99e341c0b553fdd5
Author: George Baltz N3GB <Geo...@gm...>
Date: Wed Dec 3 12:50:50 2025 -0500
Remove last traces of HAMLIB_PARAMS
diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h
index 3b526b41c..2789f35c5 100644
--- a/include/hamlib/rig.h
+++ b/include/hamlib/rig.h
@@ -126,14 +126,10 @@
#endif
//! @endcond
-/* HAMLIB_PARAMS is a macro used to wrap function prototypes, so that compilers
- * that don't understand ANSI C prototypes still work, and ANSI C
- * compilers can issue warnings about type mismatches. */
//! @cond Doxygen_Suppress
-#undef HAMLIB_PARAMS
-# define HAMLIB_PARAMS(protos) protos
-# define rig_ptr_t void *
-# define amp_ptr_t void *
+// Relics from the days of char * as generic pointer
+#define rig_ptr_t void *
+#define amp_ptr_t void *
//! @endcond
#include <hamlib/rig_dll.h>
commit b0f73d4ce7160f545814d90a0c13ddab2a61a04b
Author: George Baltz N3GB <Geo...@gm...>
Date: Wed Dec 3 12:34:25 2025 -0500
And modernize rotator.h
diff --git a/include/hamlib/rotator.h b/include/hamlib/rotator.h
index 88de79fd1..aad3d3028 100644
--- a/include/hamlib/rotator.h
+++ b/include/hamlib/rotator.h
@@ -598,262 +598,254 @@ struct s_rot {
/* --------------- API function prototypes -----------------*/
extern HAMLIB_EXPORT(ROT *)
-rot_init HAMLIB_PARAMS((rot_model_t rot_model));
+rot_init(rot_model_t rot_model);
extern HAMLIB_EXPORT(int)
-rot_open HAMLIB_PARAMS((ROT *rot));
+rot_open(ROT *rot);
extern HAMLIB_EXPORT(int)
-rot_close HAMLIB_PARAMS((ROT *rot));
+rot_close(ROT *rot);
extern HAMLIB_EXPORT(int)
-rot_cleanup HAMLIB_PARAMS((ROT *rot));
+rot_cleanup(ROT *rot);
extern HAMLIB_EXPORT(int)
-rot_set_conf HAMLIB_PARAMS((ROT *rot,
- hamlib_token_t token,
- const char *val));
+rot_set_conf(ROT *rot,
+ hamlib_token_t token,
+ const char *val);
HL_DEPRECATED extern HAMLIB_EXPORT(int)
-rot_get_conf HAMLIB_PARAMS((ROT *rot,
- hamlib_token_t token,
- char *val));
+rot_get_conf(ROT *rot,
+ hamlib_token_t token,
+ char *val);
extern HAMLIB_EXPORT(int)
-rot_get_conf2 HAMLIB_PARAMS((ROT *rot,
- hamlib_token_t token,
- char *val,
- int val_len));
+rot_get_conf2(ROT *rot,
+ hamlib_token_t token,
+ char *val,
+ int val_len);
/*
* General API commands, from most primitive to least.. )
* List Set/Get functions pairs
*/
extern HAMLIB_EXPORT(int)
-rot_set_position HAMLIB_PARAMS((ROT *rot,
- azimuth_t azimuth,
- elevation_t elevation));
+rot_set_position(ROT *rot,
+ azimuth_t azimuth,
+ elevation_t elevation);
extern HAMLIB_EXPORT(int)
-rot_get_position HAMLIB_PARAMS((ROT *rot,
- azimuth_t *azimuth,
- elevation_t *elevation));
+rot_get_position(ROT *rot,
+ azimuth_t *azimuth,
+ elevation_t *elevation);
extern HAMLIB_EXPORT(int)
-rot_stop HAMLIB_PARAMS((ROT *rot));
+rot_stop(ROT *rot);
extern HAMLIB_EXPORT(int)
-rot_park HAMLIB_PARAMS((ROT *rot));
+rot_park(ROT *rot);
extern HAMLIB_EXPORT(int)
-rot_reset HAMLIB_PARAMS((ROT *rot,
- rot_reset_t reset));
+rot_reset(ROT *rot,
+ rot_reset_t reset);
extern HAMLIB_EXPORT(int)
-rot_move HAMLIB_PARAMS((ROT *rot,
- int direction,
- int speed));
+rot_move(ROT *rot,
+ int direction,
+ int speed);
extern HAMLIB_EXPORT(setting_t)
-rot_has_get_level HAMLIB_PARAMS((ROT *rot,
- setting_t level));
+rot_has_get_level(ROT *rot,
+ setting_t level);
extern HAMLIB_EXPORT(setting_t)
-rot_has_set_level HAMLIB_PARAMS((ROT *rot,
- setting_t level));
+rot_has_set_level(ROT *rot,
+ setting_t level);
extern HAMLIB_EXPORT(setting_t)
-rot_has_get_parm HAMLIB_PARAMS((ROT *rot,
- setting_t parm));
+rot_has_get_parm(ROT *rot,
+ setting_t parm);
extern HAMLIB_EXPORT(setting_t)
-rot_has_set_parm HAMLIB_PARAMS((ROT *rot,
- setting_t parm));
+rot_has_set_parm(ROT *rot,
+ setting_t parm);
extern HAMLIB_EXPORT(setting_t)
-rot_has_get_func HAMLIB_PARAMS((ROT *rot,
- setting_t func));
+rot_has_get_func(ROT *rot,
+ setting_t func);
extern HAMLIB_EXPORT(setting_t)
-rot_has_set_func HAMLIB_PARAMS((ROT *rot,
- setting_t func));
+rot_has_set_func(ROT *rot,
+ setting_t func);
extern HAMLIB_EXPORT(int)
-rot_set_func HAMLIB_PARAMS((ROT *rot,
- setting_t func,
- int status));
+rot_set_func(ROT *rot,
+ setting_t func,
+ int status);
extern HAMLIB_EXPORT(int)
-rot_get_func HAMLIB_PARAMS((ROT *rot,
- setting_t func,
- int *status));
+rot_get_func(ROT *rot,
+ setting_t func,
+ int *status);
extern HAMLIB_EXPORT(int)
-rot_set_level HAMLIB_PARAMS((ROT *rig,
- setting_t level,
- value_t val));
+rot_set_level(ROT *rig,
+ setting_t level,
+ value_t val);
extern HAMLIB_EXPORT(int)
-rot_get_level HAMLIB_PARAMS((ROT *rig,
- setting_t level,
- value_t *val));
+rot_get_level(ROT *rig,
+ setting_t level,
+ value_t *val);
extern HAMLIB_EXPORT(int)
-rot_set_parm HAMLIB_PARAMS((ROT *rig,
- setting_t parm,
- value_t val));
+rot_set_parm(ROT *rig,
+ setting_t parm,
+ value_t val);
extern HAMLIB_EXPORT(int)
-rot_get_parm HAMLIB_PARAMS((ROT *rig,
- setting_t parm,
- value_t *val));
+rot_get_parm(ROT *rig,
+ setting_t parm,
+ value_t *val);
extern HAMLIB_EXPORT(int)
-rot_set_ext_level HAMLIB_PARAMS((ROT *rig,
- hamlib_token_t token,
- value_t val));
+rot_set_ext_level(ROT *rig,
+ hamlib_token_t token,
+ value_t val);
extern HAMLIB_EXPORT(int)
-rot_get_ext_level HAMLIB_PARAMS((ROT *rig,
- hamlib_token_t token,
- value_t *val));
+rot_get_ext_level(ROT *rig,
+ hamlib_token_t token,
+ value_t *val);
extern HAMLIB_EXPORT(int)
-rot_set_ext_func HAMLIB_PARAMS((ROT *rig,
- hamlib_token_t token,
- int status));
+rot_set_ext_func(ROT *rig,
+ hamlib_token_t token,
+ int status);
extern HAMLIB_EXPORT(int)
-rot_get_ext_func HAMLIB_PARAMS((ROT *rig,
- hamlib_token_t token,
- int *status));
+rot_get_ext_func(ROT *rig,
+ hamlib_token_t token,
+ int *status);
extern HAMLIB_EXPORT(int)
-rot_set_ext_parm HAMLIB_PARAMS((ROT *rig,
- hamlib_token_t token,
- value_t val));
+rot_set_ext_parm(ROT *rig,
+ hamlib_token_t token,
+ value_t val);
extern HAMLIB_EXPORT(int)
-rot_get_ext_parm HAMLIB_PARAMS((ROT *rig,
- hamlib_token_t token,
- value_t *val));
+rot_get_ext_parm(ROT *rig,
+ hamlib_token_t token,
+ value_t *val);
extern HAMLIB_EXPORT(const char *)
-rot_get_info HAMLIB_PARAMS((ROT *rot));
+rot_get_info(ROT *rot);
extern HAMLIB_EXPORT(int)
-rot_get_status HAMLIB_PARAMS((ROT *rot,
- rot_status_t *status));
+rot_get_status(ROT *rot,
+ rot_status_t *status);
extern HAMLIB_EXPORT(int)
-rot_register HAMLIB_PARAMS((const struct rot_caps *caps));
+rot_register(const struct rot_caps *caps);
extern HAMLIB_EXPORT(int)
-rot_unregister HAMLIB_PARAMS((rot_model_t rot_model));
+rot_unregister(rot_model_t rot_model);
extern HAMLIB_EXPORT(int)
-rot_list_foreach HAMLIB_PARAMS((int (*cfunc)(const struct rot_caps *,
- rig_ptr_t),
- rig_ptr_t data));
+rot_list_foreach(int (*cfunc)(const struct rot_caps *, rig_ptr_t),
+ rig_ptr_t data);
extern HAMLIB_EXPORT(int)
-rot_load_backend HAMLIB_PARAMS((const char *be_name));
+rot_load_backend(const char *be_name);
extern HAMLIB_EXPORT(int)
-rot_check_backend HAMLIB_PARAMS((rot_model_t rot_model));
+rot_check_backend(rot_model_t rot_model);
extern HAMLIB_EXPORT(int)
-rot_load_all_backends HAMLIB_PARAMS((void));
+rot_load_all_backends(void);
extern HAMLIB_EXPORT(rot_model_t)
-rot_probe_all HAMLIB_PARAMS((hamlib_port_t *p));
+rot_probe_all(hamlib_port_t *p);
extern HAMLIB_EXPORT(int)
-rot_token_foreach HAMLIB_PARAMS((ROT *rot,
- int (*cfunc)(const struct confparams *,
- rig_ptr_t),
- rig_ptr_t data));
+rot_token_foreach(ROT *rot,
+ int (*cfunc)(const struct confparams *, rig_ptr_t),
+ rig_ptr_t data);
extern HAMLIB_EXPORT(const struct confparams *)
-rot_confparam_lookup HAMLIB_PARAMS((ROT *rot,
- const char *name));
+rot_confparam_lookup(ROT *rot,
+ const char *name);
extern HAMLIB_EXPORT(hamlib_token_t)
-rot_token_lookup HAMLIB_PARAMS((ROT *rot,
- const char *name));
+rot_token_lookup(ROT *rot,
+ const char *name);
extern HAMLIB_EXPORT(int)
-rot_ext_func_foreach HAMLIB_PARAMS((ROT *rot,
- int (*cfunc)(ROT *,
- const struct confparams *,
- rig_ptr_t),
- rig_ptr_t data));
+rot_ext_func_foreach(ROT *rot,
+ int (*cfunc)(ROT *, const struct confparams *, rig_ptr_t),
+ rig_ptr_t data);
extern HAMLIB_EXPORT(int)
-rot_ext_level_foreach HAMLIB_PARAMS((ROT *rot,
- int (*cfunc)(ROT *,
- const struct confparams *,
- rig_ptr_t),
- rig_ptr_t data));
+rot_ext_level_foreach(ROT *rot,
+ int (*cfunc)(ROT *, const struct confparams *, rig_ptr_t),
+ rig_ptr_t data);
extern HAMLIB_EXPORT(int)
-rot_ext_parm_foreach HAMLIB_PARAMS((ROT *rot,
- int (*cfunc)(ROT *,
- const struct confparams *,
- rig_ptr_t),
- rig_ptr_t data));
+rot_ext_parm_foreach(ROT *rot,
+ int (*cfunc)(ROT *, const struct confparams *, rig_ptr_t),
+ rig_ptr_t data);
extern HAMLIB_EXPORT(const struct confparams *)
-rot_ext_lookup HAMLIB_PARAMS((ROT *rot,
- const char *name));
+rot_ext_lookup(ROT *rot,
+ const char *name);
extern HAMLIB_EXPORT(const struct confparams *)
-rot_ext_lookup_tok HAMLIB_PARAMS((ROT *rot,
- hamlib_token_t token));
+rot_ext_lookup_tok(ROT *rot,
+ hamlib_token_t token);
extern HAMLIB_EXPORT(hamlib_token_t)
-rot_ext_token_lookup HAMLIB_PARAMS((ROT *rot,
- const char *name));
+rot_ext_token_lookup(ROT *rot,
+ const char *name);
extern HAMLIB_EXPORT(const struct rot_caps *)
-rot_get_caps HAMLIB_PARAMS((rot_model_t rot_model));
+rot_get_caps(rot_model_t rot_model);
extern HAMLIB_EXPORT(int)
-qrb HAMLIB_PARAMS((double lon1,
- double lat1,
- double lon2,
- double lat2,
- double *distance,
- double *azimuth));
+qrb(double lon1,
+ double lat1,
+ double lon2,
+ double lat2,
+ double *distance,
+ double *azimuth);
extern HAMLIB_EXPORT(double)
-distance_long_path HAMLIB_PARAMS((double distance));
+distance_long_path(double distance);
extern HAMLIB_EXPORT(double)
-azimuth_long_path HAMLIB_PARAMS((double azimuth));
+azimuth_long_path(double azimuth);
#if 0
extern HAMLIB_EXPORT(int)
-longlat2locator HAMLIB_PARAMS((double longitude,
- double latitude,
- char *locator_res,
- int pair_count));
+longlat2locator(double longitude,
+ double latitude,
+ char *locator_res,
+ int pair_count);
extern HAMLIB_EXPORT(int)
-locator2longlat HAMLIB_PARAMS((double *longitude,
- double *latitude,
- const char *locator));
+locator2longlat(double *longitude,
+ double *latitude,
+ const char *locator);
#endif
extern HAMLIB_EXPORT(double)
-dms2dec HAMLIB_PARAMS((int degrees,
- int minutes,
- double seconds,
- int sw));
+dms2dec(int degrees,
+ int minutes,
+ double seconds,
+ int sw);
extern HAMLIB_EXPORT(int)
-dec2dms HAMLIB_PARAMS((double dec,
- int *degrees,
- int *minutes,
- double *seconds,
- int *sw));
+dec2dms(double dec,
+ int *degrees,
+ int *minutes,
+ double *seconds,
+ int *sw);
extern HAMLIB_EXPORT(int)
-dec2dmmm HAMLIB_PARAMS((double dec,
- int *degrees,
- double *minutes,
- int *sw));
+dec2dmmm(double dec,
+ int *degrees,
+ double *minutes,
+ int *sw);
extern HAMLIB_EXPORT(double)
-dmmm2dec HAMLIB_PARAMS((int degrees,
- double minutes,
- int sw));
+dmmm2dec(int degrees,
+ double minutes,
+ int sw);
extern HAMLIB_EXPORT(setting_t) rot_parse_func(const char *s);
extern HAMLIB_EXPORT(setting_t) rot_parse_level(const char *s);
commit f434746cea6da161e747b3e32bbce518a6183460
Author: George Baltz N3GB <Geo...@gm...>
Date: Wed Dec 3 11:31:34 2025 -0500
ANSIfy amplifier.h
diff --git a/include/hamlib/amplifier.h b/include/hamlib/amplifier.h
index f49d1d37f..4029b02eb 100644
--- a/include/hamlib/amplifier.h
+++ b/include/hamlib/amplifier.h
@@ -295,36 +295,36 @@ struct amp
/* --------------- API function prototypes -----------------*/
extern HAMLIB_EXPORT(AMP *)
-amp_init HAMLIB_PARAMS((amp_model_t amp_model));
+amp_init(amp_model_t amp_model);
extern HAMLIB_EXPORT(int)
-amp_open HAMLIB_PARAMS((AMP *amp));
+amp_open(AMP *amp);
extern HAMLIB_EXPORT(int)
-amp_close HAMLIB_PARAMS((AMP *amp));
+amp_close(AMP *amp);
extern HAMLIB_EXPORT(int)
-amp_cleanup HAMLIB_PARAMS((AMP *amp));
+amp_cleanup(AMP *amp);
extern HAMLIB_EXPORT(int)
-amp_set_conf HAMLIB_PARAMS((AMP *amp,
- hamlib_token_t token,
- const char *val));
+amp_set_conf(AMP *amp,
+ hamlib_token_t token,
+ const char *val);
HL_DEPRECATED extern HAMLIB_EXPORT(int)
-amp_get_conf HAMLIB_PARAMS((AMP *amp,
- hamlib_token_t token,
- char *val));
+amp_get_conf(AMP *amp,
+ hamlib_token_t token,
+ char *val);
extern HAMLIB_EXPORT(int)
-amp_get_conf2 HAMLIB_PARAMS((AMP *amp,
- hamlib_token_t token,
- char *val,
- int val_len));
+amp_get_conf2(AMP *amp,
+ hamlib_token_t token,
+ char *val,
+ int val_len);
extern HAMLIB_EXPORT(int)
-amp_set_powerstat HAMLIB_PARAMS((AMP *amp,
- powerstat_t status));
+amp_set_powerstat(AMP *amp,
+ powerstat_t status);
extern HAMLIB_EXPORT(int)
-amp_get_powerstat HAMLIB_PARAMS((AMP *amp,
- powerstat_t *status));
+amp_get_powerstat(AMP *amp,
+ powerstat_t *status);
/*
@@ -332,93 +332,91 @@ amp_get_powerstat HAMLIB_PARAMS((AMP *amp,
* List Set/Get functions pairs
*/
extern HAMLIB_EXPORT(int)
-amp_get_freq HAMLIB_PARAMS((AMP *amp,
- freq_t *freq));
+amp_get_freq(AMP *amp,
+ freq_t *freq);
extern HAMLIB_EXPORT(int)
-amp_set_freq HAMLIB_PARAMS((AMP *amp,
- freq_t freq));
+amp_set_freq(AMP *amp,
+ freq_t freq);
extern HAMLIB_EXPORT(int)
-amp_reset HAMLIB_PARAMS((AMP *amp,
- amp_reset_t reset));
+amp_reset(AMP *amp,
+ amp_reset_t reset);
extern HAMLIB_EXPORT(const char *)
-amp_get_info HAMLIB_PARAMS((AMP *amp));
+amp_get_info(AMP *amp);
extern HAMLIB_EXPORT(int)
-amp_get_level HAMLIB_PARAMS((AMP *amp, setting_t level, value_t *val));
+amp_get_level(AMP *amp, setting_t level, value_t *val);
extern HAMLIB_EXPORT(int)
-amp_set_level HAMLIB_PARAMS((AMP *amp, setting_t level, value_t val));
+amp_set_level(AMP *amp, setting_t level, value_t val);
extern HAMLIB_EXPORT(int)
-amp_register HAMLIB_PARAMS((const struct amp_caps *caps));
+amp_register(const struct amp_caps *caps);
extern HAMLIB_EXPORT(int)
-amp_unregister HAMLIB_PARAMS((amp_model_t amp_model));
+amp_unregister(amp_model_t amp_model);
extern HAMLIB_EXPORT(int)
-amp_list_foreach HAMLIB_PARAMS((int (*cfunc)(const struct amp_caps *,
- rig_ptr_t),
- rig_ptr_t data));
+amp_list_foreach(int (*cfunc)(const struct amp_caps *, rig_ptr_t),
+ rig_ptr_t data);
extern HAMLIB_EXPORT(int)
-amp_load_backend HAMLIB_PARAMS((const char *be_name));
+amp_load_backend(const char *be_name);
extern HAMLIB_EXPORT(int)
-amp_check_backend HAMLIB_PARAMS((amp_model_t amp_model));
+amp_check_backend(amp_model_t amp_model);
extern HAMLIB_EXPORT(int)
-amp_load_all_backends HAMLIB_PARAMS((void));
+amp_load_all_backends(void);
extern HAMLIB_EXPORT(amp_model_t)
-amp_probe_all HAMLIB_PARAMS((hamlib_port_t *p));
+amp_probe_all(hamlib_port_t *p);
extern HAMLIB_EXPORT(int)
-amp_token_foreach HAMLIB_PARAMS((AMP *amp,
- int (*cfunc)(const struct confparams *,
- rig_ptr_t),
- rig_ptr_t data));
+amp_token_foreach(AMP *amp,
+ int (*cfunc)(const struct confparams *, rig_ptr_t),
+ rig_ptr_t data);
extern HAMLIB_EXPORT(const struct confparams *)
-amp_confparam_lookup HAMLIB_PARAMS((AMP *amp,
- const char *name));
+amp_confparam_lookup(AMP *amp,
+ const char *name);
extern HAMLIB_EXPORT(hamlib_token_t)
-amp_token_lookup HAMLIB_PARAMS((AMP *amp,
- const char *name));
+amp_token_lookup(AMP *amp,
+ const char *name);
extern HAMLIB_EXPORT(const struct amp_caps *)
-amp_get_caps HAMLIB_PARAMS((amp_model_t amp_model));
+amp_get_caps(amp_model_t amp_model);
extern HAMLIB_EXPORT(setting_t)
-amp_has_get_level HAMLIB_PARAMS((AMP *amp,
- setting_t level));
+amp_has_get_level(AMP *amp,
+ setting_t level);
extern HAMLIB_EXPORT(setting_t)
-amp_has_set_level HAMLIB_PARAMS((AMP *amp,
- setting_t level));
+amp_has_set_level(AMP *amp,
+ setting_t level);
extern HAMLIB_EXPORT(const struct confparams *)
-amp_ext_lookup HAMLIB_PARAMS((AMP *amp,
- const char *name));
+amp_ext_lookup(AMP *amp,
+ const char *name);
extern HAMLIB_EXPORT(int)
-amp_get_ext_level HAMLIB_PARAMS((AMP *amp,
- hamlib_token_t token,
- value_t *val));
+amp_get_ext_level(AMP *amp,
+ hamlib_token_t token,
+ value_t *val);
extern HAMLIB_EXPORT(int)
-amp_set_ext_level HAMLIB_PARAMS((AMP *amp,
- hamlib_token_t token,
- value_t val));
+amp_set_ext_level(AMP *amp,
+ hamlib_token_t token,
+ value_t val);
extern HAMLIB_EXPORT(const char *) amp_strlevel(setting_t);
extern HAMLIB_EXPORT(const struct confparams *)
-rig_ext_lookup HAMLIB_PARAMS((RIG *rig,
- const char *name));
+rig_ext_lookup(RIG *rig,
+ const char *name);
extern HAMLIB_EXPORT(setting_t) amp_parse_level(const char *s);
extern HAMLIB_EXPORT(const char *) amp_strlevel(setting_t);
commit 845f60c82ecc72f7e7af6435aa26525e6d3be4b8
Author: George Baltz N3GB <Geo...@gm...>
Date: Tue Dec 2 17:07:52 2025 -0500
Remove support for non-ANSI C compilers.
All functions in rig.h now always have full prototypes.
The gotcha in here was needing to move the prototype for rig_debug()
to before the definition of the macro with the same name. Previously
with the HAMLIB_PARAMS wrapper, the signatures didn't match; without
it the compiler tried to expand the name in the prototype as the macro,
causing syntax errors.
diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h
index bc1e8e73f..3b526b41c 100644
--- a/include/hamlib/rig.h
+++ b/include/hamlib/rig.h
@@ -131,20 +131,9 @@
* compilers can issue warnings about type mismatches. */
//! @cond Doxygen_Suppress
#undef HAMLIB_PARAMS
-#if defined (__STDC__) \
- || defined (_AIX) \
- || (defined (__mips) && defined (_SYSTYPE_SVR4)) \
- || defined(__CYGWIN__) \
- || defined(_WIN32) \
- || defined(__cplusplus)
# define HAMLIB_PARAMS(protos) protos
# define rig_ptr_t void *
# define amp_ptr_t void *
-#else
-# define HAMLIB_PARAMS(protos) ()
-# define rig_ptr_t char *
-# define amp_ptr_t char *
-#endif
//! @endcond
#include <hamlib/rig_dll.h>
@@ -2682,8 +2671,8 @@ struct s_rig {
//! @cond Doxygen_Suppress
-extern HAMLIB_EXPORT(RIG *) rig_init HAMLIB_PARAMS((rig_model_t rig_model));
-extern HAMLIB_EXPORT(int) rig_open HAMLIB_PARAMS((RIG *rig));
+extern HAMLIB_EXPORT(RIG *) rig_init(rig_model_t rig_model);
+extern HAMLIB_EXPORT(int) rig_open(RIG *rig);
/*
* General API commands, from most primitive to least.. :()
@@ -2702,609 +2691,603 @@ rig_lock(RIG *rig, int lock);
#if BUILTINFUNC
#define rig_set_freq(r,v,f) rig_set_freq(r,v,f,__builtin_FUNCTION())
extern HAMLIB_EXPORT(int)
-rig_set_freq HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- freq_t freq, const char*));
+rig_set_freq(RIG *rig,
+ vfo_t vfo,
+ freq_t freq, const char*);
#else
extern HAMLIB_EXPORT(int)
-rig_set_freq HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- freq_t freq));
+rig_set_freq(RIG *rig,
+ vfo_t vfo,
+ freq_t freq);
#endif
#if BUILTINFUNC
#define rig_get_freq(r,v,f) rig_get_freq(r,v,f,__builtin_FUNCTION())
extern HAMLIB_EXPORT(int)
-rig_get_freq HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- freq_t *freq, const char*));
+rig_get_freq(RIG *rig,
+ vfo_t vfo,
+ freq_t *freq, const char*);
#else
extern HAMLIB_EXPORT(int)
-rig_get_freq HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- freq_t *freq));
+rig_get_freq(RIG *rig,
+ vfo_t vfo,
+ freq_t *freq);
#endif
extern HAMLIB_EXPORT(int)
-rig_set_mode HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- rmode_t mode,
- pbwidth_t width));
+rig_set_mode(RIG *rig,
+ vfo_t vfo,
+ rmode_t mode,
+ pbwidth_t width);
extern HAMLIB_EXPORT(int)
-rig_get_mode HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- rmode_t *mode,
- pbwidth_t *width));
+rig_get_mode(RIG *rig,
+ vfo_t vfo,
+ rmode_t *mode,
+ pbwidth_t *width);
#if BUILTINFUNC
#define rig_set_vfo(r,v) rig_set_vfo(r,v,__builtin_FUNCTION())
extern HAMLIB_EXPORT(int)
-rig_set_vfo HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo, const char *func));
+rig_set_vfo(RIG *rig,
+ vfo_t vfo, const char *func);
#else
extern HAMLIB_EXPORT(int)
-rig_set_vfo HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo));
+rig_set_vfo(RIG *rig,
+ vfo_t vfo);
#endif
extern HAMLIB_EXPORT(int)
-rig_get_vfo HAMLIB_PARAMS((RIG *rig,
- vfo_t *vfo));
+rig_get_vfo(RIG *rig,
+ vfo_t *vfo);
extern HAMLIB_EXPORT(int)
-rig_get_vfo_info HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- freq_t *freq,
- rmode_t *mode,
- pbwidth_t *width,
- split_t *split,
- int *satmode));
+rig_get_vfo_info(RIG *rig,
+ vfo_t vfo,
+ freq_t *freq,
+ rmode_t *mode,
+ pbwidth_t *width,
+ split_t *split,
+ int *satmode);
extern HAMLIB_EXPORT(int)
-rig_get_vfo_list HAMLIB_PARAMS((RIG *rig, char *buf, int buflen));
+rig_get_vfo_list(RIG *rig, char *buf, int buflen);
extern HAMLIB_EXPORT(int)
-netrigctl_get_vfo_mode HAMLIB_PARAMS((RIG *rig));
+netrigctl_get_vfo_mode(RIG *rig);
extern HAMLIB_EXPORT(int)
-rig_set_ptt HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- ptt_t ptt));
+rig_set_ptt(RIG *rig,
+ vfo_t vfo,
+ ptt_t ptt);
extern HAMLIB_EXPORT(int)
-rig_get_ptt HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- ptt_t *ptt));
+rig_get_ptt(RIG *rig,
+ vfo_t vfo,
+ ptt_t *ptt);
extern HAMLIB_EXPORT(int)
-rig_get_dcd HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- dcd_t *dcd));
+rig_get_dcd(RIG *rig,
+ vfo_t vfo,
+ dcd_t *dcd);
extern HAMLIB_EXPORT(int)
-rig_set_rptr_shift HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- rptr_shift_t rptr_shift));
+rig_set_rptr_shift(RIG *rig,
+ vfo_t vfo,
+ rptr_shift_t rptr_shift);
extern HAMLIB_EXPORT(int)
-rig_get_rptr_shift HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- rptr_shift_t *rptr_shift));
+rig_get_rptr_shift(RIG *rig,
+ vfo_t vfo,
+ rptr_shift_t *rptr_shift);
extern HAMLIB_EXPORT(int)
-rig_set_rptr_offs HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- shortfreq_t rptr_offs));
+rig_set_rptr_offs(RIG *rig,
+ vfo_t vfo,
+ shortfreq_t rptr_offs);
extern HAMLIB_EXPORT(int)
-rig_get_rptr_offs HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- shortfreq_t *rptr_offs));
+rig_get_rptr_offs(RIG *rig,
+ vfo_t vfo,
+ shortfreq_t *rptr_offs);
extern HAMLIB_EXPORT(int)
-rig_set_ctcss_tone HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- tone_t tone));
+rig_set_ctcss_tone(RIG *rig,
+ vfo_t vfo,
+ tone_t tone);
extern HAMLIB_EXPORT(int)
-rig_get_ctcss_tone HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- tone_t *tone));
+rig_get_ctcss_tone(RIG *rig,
+ vfo_t vfo,
+ tone_t *tone);
extern HAMLIB_EXPORT(int)
-rig_set_dcs_code HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- tone_t code));
+rig_set_dcs_code(RIG *rig,
+ vfo_t vfo,
+ tone_t code);
extern HAMLIB_EXPORT(int)
-rig_get_dcs_code HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- tone_t *code));
+rig_get_dcs_code(RIG *rig,
+ vfo_t vfo,
+ tone_t *code);
extern HAMLIB_EXPORT(int)
-rig_set_ctcss_sql HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- tone_t tone));
+rig_set_ctcss_sql(RIG *rig,
+ vfo_t vfo,
+ tone_t tone);
extern HAMLIB_EXPORT(int)
-rig_get_ctcss_sql HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- tone_t *tone));
+rig_get_ctcss_sql(RIG *rig,
+ vfo_t vfo,
+ tone_t *tone);
extern HAMLIB_EXPORT(int)
-rig_set_dcs_sql HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- tone_t code));
+rig_set_dcs_sql(RIG *rig,
+ vfo_t vfo,
+ tone_t code);
extern HAMLIB_EXPORT(int)
-rig_get_dcs_sql HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- tone_t *code));
+rig_get_dcs_sql(RIG *rig,
+ vfo_t vfo,
+ tone_t *code);
extern HAMLIB_EXPORT(int)
-rig_set_split_freq HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- freq_t tx_freq));
+rig_set_split_freq(RIG *rig,
+ vfo_t vfo,
+ freq_t tx_freq);
extern HAMLIB_EXPORT(int)
-rig_get_split_freq HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- freq_t *tx_freq));
+rig_get_split_freq(RIG *rig,
+ vfo_t vfo,
+ freq_t *tx_freq);
extern HAMLIB_EXPORT(int)
-rig_set_split_mode HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- rmode_t tx_mode,
- pbwidth_t tx_width));
+rig_set_split_mode(RIG *rig,
+ vfo_t vfo,
+ rmode_t tx_mode,
+ pbwidth_t tx_width);
extern HAMLIB_EXPORT(int)
-rig_get_split_mode HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- rmode_t *tx_mode,
- pbwidth_t *tx_width));
+rig_get_split_mode(RIG *rig,
+ vfo_t vfo,
+ rmode_t *tx_mode,
+ pbwidth_t *tx_width);
extern HAMLIB_EXPORT(int)
-rig_set_split_freq_mode HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- freq_t tx_freq,
- rmode_t tx_mode,
- pbwidth_t tx_width));
+rig_set_split_freq_mode(RIG *rig,
+ vfo_t vfo,
+ freq_t tx_freq,
+ rmode_t tx_mode,
+ pbwidth_t tx_width);
extern HAMLIB_EXPORT(int)
-rig_get_split_freq_mode HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- freq_t *tx_freq,
- rmode_t *tx_mode,
- pbwidth_t *tx_width));
+rig_get_split_freq_mode(RIG *rig,
+ vfo_t vfo,
+ freq_t *tx_freq,
+ rmode_t *tx_mode,
+ pbwidth_t *tx_width);
extern HAMLIB_EXPORT(int)
-rig_set_split_vfo HAMLIB_PARAMS((RIG *,
- vfo_t rx_vfo,
- split_t split,
- vfo_t tx_vfo));
+rig_set_split_vfo(RIG *rig,
+ vfo_t rx_vfo,
+ split_t split,
+ vfo_t tx_vfo);
extern HAMLIB_EXPORT(int)
-rig_get_split_vfo HAMLIB_PARAMS((RIG *,
- vfo_t rx_vfo,
- split_t *split,
- vfo_t *tx_vfo));
+rig_get_split_vfo(RIG *rig,
+ vfo_t rx_vfo,
+ split_t *split,
+ vfo_t *tx_vfo);
extern HAMLIB_EXPORT(int)
-rig_set_rit HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- shortfreq_t rit));
+rig_set_rit(RIG *rig,
+ vfo_t vfo,
+ shortfreq_t rit);
extern HAMLIB_EXPORT(int)
-rig_get_rit HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- shortfreq_t *rit));
+rig_get_rit(RIG *rig,
+ vfo_t vfo,
+ shortfreq_t *rit);
extern HAMLIB_EXPORT(int)
-rig_set_xit HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- shortfreq_t xit));
+rig_set_xit(RIG *rig,
+ vfo_t vfo,
+ shortfreq_t xit);
extern HAMLIB_EXPORT(int)
-rig_get_xit HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- shortfreq_t *xit));
+rig_get_xit(RIG *rig,
+ vfo_t vfo,
+ shortfreq_t *xit);
extern HAMLIB_EXPORT(int)
-rig_set_ts HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- shortfreq_t ts));
+rig_set_ts(RIG *rig,
+ vfo_t vfo,
+ shortfreq_t ts);
extern HAMLIB_EXPORT(int)
-rig_get_ts HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- shortfreq_t *ts));
+rig_get_ts(RIG *rig,
+ vfo_t vfo,
+ shortfreq_t *ts);
extern HAMLIB_EXPORT(int)
-rig_power2mW HAMLIB_PARAMS((RIG *rig,
- unsigned int *mwpower,
- float power,
- freq_t freq,
- rmode_t mode));
+rig_power2mW(RIG *rig,
+ unsigned int *mwpower,
+ float power,
+ freq_t freq,
+ rmode_t mode);
extern HAMLIB_EXPORT(int)
-rig_mW2power HAMLIB_PARAMS((RIG *rig,
- float *power,
- unsigned int mwpower,
- freq_t freq,
- rmode_t mode));
+rig_mW2power(RIG *rig,
+ float *power,
+ unsigned int mwpower,
+ freq_t freq,
+ rmode_t mode);
extern HAMLIB_EXPORT(shortfreq_t)
-rig_get_resolution HAMLIB_PARAMS((RIG *rig,
- rmode_t mode));
+rig_get_resolution(RIG *rig,
+ rmode_t mode);
extern HAMLIB_EXPORT(int)
-rig_set_level HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- setting_t level,
- value_t val));
+rig_set_level(RIG *rig,
+ vfo_t vfo,
+ setting_t level,
+ value_t val);
extern HAMLIB_EXPORT(int)
-rig_get_level HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- setting_t level,
- value_t *val));
+rig_get_level(RIG *rig,
+ vfo_t vfo,
+ setting_t level,
+ value_t *val);
#define rig_get_strength(r,v,s) rig_get_level((r),(v),RIG_LEVEL_STRENGTH, (value_t*)(s))
extern HAMLIB_EXPORT(int)
-rig_set_parm HAMLIB_PARAMS((RIG *rig,
- setting_t parm,
- value_t val));
+rig_set_parm(RIG *rig,
+ setting_t parm,
+ value_t val);
extern HAMLIB_EXPORT(int)
-rig_get_parm HAMLIB_PARAMS((RIG *rig,
- setting_t parm,
- value_t *val));
+rig_get_parm(RIG *rig,
+ setting_t parm,
+ value_t *val);
extern HAMLIB_EXPORT(int)
-rig_set_conf HAMLIB_PARAMS((RIG *rig,
- hamlib_token_t token,
- const char *val));
+rig_set_conf(RIG *rig,
+ hamlib_token_t token,
+ const char *val);
// deprecating rig_get_conf
HL_DEPRECATED extern HAMLIB_EXPORT(int)
-rig_get_conf HAMLIB_PARAMS((RIG *rig,
- hamlib_token_t token,
- char *val));
+rig_get_conf(RIG *rig,
+ hamlib_token_t token,
+ char *val);
extern HAMLIB_EXPORT(int)
-rig_get_conf2 HAMLIB_PARAMS((RIG *rig,
- hamlib_token_t token,
- char *val,
- int val_len));
+rig_get_conf2(RIG *rig,
+ hamlib_token_t token,
+ char *val,
+ int val_len);
extern HAMLIB_EXPORT(int)
-rig_set_powerstat HAMLIB_PARAMS((RIG *rig,
- powerstat_t status));
+rig_set_powerstat(RIG *rig,
+ powerstat_t status);
extern HAMLIB_EXPORT(int)
-rig_get_powerstat HAMLIB_PARAMS((RIG *rig,
- powerstat_t *status));
+rig_get_powerstat(RIG *rig,
+ powerstat_t *status);
extern HAMLIB_EXPORT(int)
-rig_reset HAMLIB_PARAMS((RIG *rig,
- reset_t reset)); /* dangerous! */
+rig_reset(RIG *rig,
+ reset_t reset); /* dangerous! */
extern HAMLIB_EXPORT(int)
-rig_set_ext_level HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- hamlib_token_t token,
- value_t val));
+rig_set_ext_level(RIG *rig,
+ vfo_t vfo,
+ hamlib_token_t token,
+ value_t val);
extern HAMLIB_EXPORT(int)
-rig_get_ext_level HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- hamlib_token_t token,
- value_t *val));
+rig_get_ext_level(RIG *rig,
+ vfo_t vfo,
+ hamlib_token_t token,
+ value_t *val);
extern HAMLIB_EXPORT(int)
-rig_set_ext_func HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- hamlib_token_t token,
- int status));
+rig_set_ext_func(RIG *rig,
+ vfo_t vfo,
+ hamlib_token_t token,
+ int status);
extern HAMLIB_EXPORT(int)
-rig_get_ext_func HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- hamlib_token_t token,
- int *status));
+rig_get_ext_func(RIG *rig,
+ vfo_t vfo,
+ hamlib_token_t token,
+ int *status);
extern HAMLIB_EXPORT(int)
-rig_set_ext_parm HAMLIB_PARAMS((RIG *rig,
- hamlib_token_t token,
- value_t val));
+rig_set_ext_parm(RIG *rig,
+ hamlib_token_t token,
+ value_t val);
extern HAMLIB_EXPORT(int)
-rig_get_ext_parm HAMLIB_PARAMS((RIG *rig,
- hamlib_token_t token,
- value_t *val));
+rig_get_ext_parm(RIG *rig,
+ hamlib_token_t token,
+ value_t *val);
extern HAMLIB_EXPORT(int)
-rig_ext_func_foreach HAMLIB_PARAMS((RIG *rig,
- int (*cfunc)(RIG *,
- const struct confparams *,
- rig_ptr_t),
- rig_ptr_t data));
+rig_ext_func_foreach(RIG *rig,
+ int (*cfunc)(RIG *, const struct confparams *, rig_ptr_t),
+ rig_ptr_t data);
extern HAMLIB_EXPORT(int)
-rig_ext_level_foreach HAMLIB_PARAMS((RIG *rig,
- int (*cfunc)(RIG *,
- const struct confparams *,
- rig_ptr_t),
- rig_ptr_t data));
+rig_ext_level_foreach(RIG *rig,
+ int (*cfunc)(RIG *, const struct confparams *, rig_ptr_t),
+ rig_ptr_t data);
extern HAMLIB_EXPORT(int)
-rig_ext_parm_foreach HAMLIB_PARAMS((RIG *rig,
- int (*cfunc)(RIG *,
- const struct confparams *,
- rig_ptr_t),
- rig_ptr_t data));
+rig_ext_parm_foreach(RIG *rig,
+ int (*cfunc)(RIG *, const struct confparams *, rig_ptr_t),
+ rig_ptr_t data);
extern HAMLIB_EXPORT(const struct confparams *)
-rig_ext_lookup HAMLIB_PARAMS((RIG *rig,
- const char *name));
+rig_ext_lookup(RIG *rig,
+ const char *name);
extern HAMLIB_EXPORT(const struct confparams *)
-rig_ext_lookup_tok HAMLIB_PARAMS((RIG *rig,
- hamlib_token_t token));
+rig_ext_lookup_tok(RIG *rig,
+ hamlib_token_t token);
extern HAMLIB_EXPORT(hamlib_token_t)
-rig_ext_token_lookup HAMLIB_PARAMS((RIG *rig,
- const char *name));
+rig_ext_token_lookup(RIG *rig,
+ const char *name);
extern HAMLIB_EXPORT(int)
-rig_token_foreach HAMLIB_PARAMS((RIG *rig,
- int (*cfunc)(const struct confparams *,
- rig_ptr_t),
- rig_ptr_t data));
+rig_token_foreach(RIG *rig,
+ int (*cfunc)(const struct confparams *, rig_ptr_t),
+ rig_ptr_t data);
extern HAMLIB_EXPORT(const struct confparams *)
-rig_confparam_lookup HAMLIB_PARAMS((RIG *rig,
- const char *name));
+rig_confparam_lookup(RIG *rig,
+ const char *name);
extern HAMLIB_EXPORT(hamlib_token_t)
-rig_token_lookup HAMLIB_PARAMS((RIG *rig,
- const char *name));
+rig_token_lookup(RIG *rig,
+ const char *name);
extern HAMLIB_EXPORT(int)
-rig_close HAMLIB_PARAMS((RIG *rig));
+rig_close(RIG *rig);
extern HAMLIB_EXPORT(int)
-rig_cleanup HAMLIB_PARAMS((RIG *rig));
+rig_cleanup(RIG *rig);
extern HAMLIB_EXPORT(int)
-rig_set_ant HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- ant_t ant, /* antenna */
- value_t option)); /* optional ant info */
+rig_set_ant(RIG *rig,
+ vfo_t vfo,
+ ant_t ant, /* antenna */
+ value_t option); /* optional ant info */
extern HAMLIB_EXPORT(int)
-rig_get_ant HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- ant_t ant,
- value_t *option,
- ant_t *ant_curr,
- ant_t *ant_tx,
- ant_t *ant_rx));
+rig_get_ant(RIG *rig,
+ vfo_t vfo,
+ ant_t ant,
+ value_t *option,
+ ant_t *ant_curr,
+ ant_t *ant_tx,
+ ant_t *ant_rx);
extern HAMLIB_EXPORT(setting_t)
-rig_has_get_level HAMLIB_PARAMS((RIG *rig,
- setting_t level));
+rig_has_get_level(RIG *rig,
+ setting_t level);
extern HAMLIB_EXPORT(setting_t)
-rig_has_set_level HAMLIB_PARAMS((RIG *rig,
- setting_t level));
+rig_has_set_level(RIG *rig,
+ setting_t level);
extern HAMLIB_EXPORT(setting_t)
-rig_has_get_parm HAMLIB_PARAMS((RIG *rig,
- setting_t parm));
+rig_has_get_parm(RIG *rig,
+ setting_t parm);
extern HAMLIB_EXPORT(setting_t)
-rig_has_set_parm HAMLIB_PARAMS((RIG *rig,
- setting_t parm));
+rig_has_set_parm(RIG *rig,
+ setting_t parm);
extern HAMLIB_EXPORT(setting_t)
-rig_has_get_func HAMLIB_PARAMS((RIG *rig,
- setting_t func));
+rig_has_get_func(RIG *rig,
+ setting_t func);
extern HAMLIB_EXPORT(setting_t)
-rig_has_set_func HAMLIB_PARAMS((RIG *rig,
- setting_t func));
+rig_has_set_func(RIG *rig,
+ setting_t func);
extern HAMLIB_EXPORT(int)
-rig_set_func HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- setting_t func,
- int status));
+rig_set_func(RIG *rig,
+ vfo_t vfo,
+ setting_t func,
+ int status);
extern HAMLIB_EXPORT(int)
-rig_get_func HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- setting_t func,
- int *status));
+rig_get_func(RIG *rig,
+ vfo_t vfo,
+ setting_t func,
+ int *status);
extern HAMLIB_EXPORT(int)
-rig_send_dtmf HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- const char *digits));
+rig_send_dtmf(RIG *rig,
+ vfo_t vfo,
+ const char *digits);
extern HAMLIB_EXPORT(int)
-rig_recv_dtmf HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- char *digits,
- int *length));
+rig_recv_dtmf(RIG *rig,
+ vfo_t vfo,
+ char *digits,
+ int *length);
extern HAMLIB_EXPORT(int)
-rig_send_morse HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- const char *msg));
+rig_send_morse(RIG *rig,
+ vfo_t vfo,
+ const char *msg);
extern HAMLIB_EXPORT(int)
-rig_stop_morse HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo));
+rig_stop_morse(RIG *rig,
+ vfo_t vfo);
extern HAMLIB_EXPORT(int)
-rig_wait_morse HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo));
+rig_wait_morse(RIG *rig,
+ vfo_t vfo);
extern HAMLIB_EXPORT(int)
-rig_send_voice_mem HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- int ch));
+rig_send_voice_mem(RIG *rig,
+ vfo_t vfo,
+ int ch);
extern HAMLIB_EXPORT(int)
-rig_stop_voice_mem HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo));
+rig_stop_voice_mem(RIG *rig,
+ vfo_t vfo);
extern HAMLIB_EXPORT(int)
-rig_set_bank HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- int bank));
+rig_set_bank(RIG *rig,
+ vfo_t vfo,
+ int bank);
extern HAMLIB_EXPORT(int)
-rig_set_mem HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- int ch));
+rig_set_mem(RIG *rig,
+ vfo_t vfo,
+ int ch);
extern HAMLIB_EXPORT(int)
-rig_get_mem HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- int *ch));
+rig_get_mem(RIG *rig,
+ vfo_t vfo,
+ int *ch);
extern HAMLIB_EXPORT(int)
-rig_vfo_op HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- vfo_op_t op));
+rig_vfo_op(RIG *rig,
+ vfo_t vfo,
+ vfo_op_t op);
extern HAMLIB_EXPORT(vfo_op_t)
-rig_has_vfo_op HAMLIB_PARAMS((RIG *rig,
- vfo_op_t op));
+rig_has_vfo_op(RIG *rig,
+ vfo_op_t op);
extern HAMLIB_EXPORT(int)
-rig_scan HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- scan_t scan,
- int ch));
+rig_scan(RIG *rig,
+ vfo_t vfo,
+ scan_t scan,
+ int ch);
extern HAMLIB_EXPORT(scan_t)
-rig_has_scan HAMLIB_PARAMS((RIG *rig,
- scan_t scan));
+rig_has_scan(RIG *rig,
+ scan_t scan);
extern HAMLIB_EXPORT(int)
-rig_set_channel HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- const channel_t *chan)); /* mem */
+rig_set_channel(RIG *rig,
+ vfo_t vfo,
+ const channel_t *chan); /* mem */
extern HAMLIB_EXPORT(int)
-rig_get_channel HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- channel_t *chan, int read_only));
+rig_get_channel(RIG *rig,
+ vfo_t vfo,
+ channel_t *chan,
+ int read_only);
extern HAMLIB_EXPORT(int)
-rig_set_chan_all HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- const channel_t chans[]));
+rig_set_chan_all(RIG *rig,
+ vfo_t vfo,
+ const channel_t chans[]);
extern HAMLIB_EXPORT(int)
-rig_get_chan_all HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- channel_t chans[]));
+rig_get_chan_all(RIG *rig,
+ vfo_t vfo,
+ channel_t chans[]);
extern HAMLIB_EXPORT(int)
-rig_set_chan_all_cb HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- chan_cb_t chan_cb,
- rig_ptr_t));
+rig_set_chan_all_cb(RIG *rig,
+ vfo_t vfo,
+ chan_cb_t chan_cb,
+ rig_ptr_t);
extern HAMLIB_EXPORT(int)
-rig_get_chan_all_cb HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- chan_cb_t chan_cb,
- rig_ptr_t));
+rig_get_chan_all_cb(RIG *rig,
+ vfo_t vfo,
+ chan_cb_t chan_cb,
+ rig_ptr_t);
extern HAMLIB_EXPORT(int)
-rig_set_mem_all_cb HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- chan_cb_t chan_cb,
- confval_cb_t parm_cb,
- rig_ptr_t));
+rig_set_mem_all_cb(RIG *rig,
+ vfo_t vfo,
+ chan_cb_t chan_cb,
+ confval_cb_t parm_cb,
+ rig_ptr_t);
extern HAMLIB_EXPORT(int)
-rig_get_mem_all_cb HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- chan_cb_t chan_cb,
- confval_cb_t parm_cb,
- rig_ptr_t));
+rig_get_mem_all_cb(RIG *rig,
+ vfo_t vfo,
+ chan_cb_t chan_cb,
+ confval_cb_t parm_cb,
+ rig_ptr_t);
extern HAMLIB_EXPORT(int)
-rig_set_mem_all HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- const channel_t *chan,
- const struct confparams *,
- const value_t *));
+rig_set_mem_all(RIG *rig,
+ vfo_t vfo,
+ const channel_t *chan,
+ const struct confparams *,
+ const value_t *);
extern HAMLIB_EXPORT(int)
-rig_get_mem_all HAMLIB_PARAMS((RIG *rig,
- vfo_t vfo,
- channel_t *chan,
- const struct confparams *,
- value_t *));
+rig_get_mem_all(RIG *rig,
+ vfo_t vfo,
+ channel_t *chan,
+ const struct confparams *,
+ value_t *);
extern HAMLIB_EXPORT(const chan_t *)
-rig_lookup_mem_caps HAMLIB_PARAMS((RIG *rig,
- int ch));
+rig_lookup_mem_caps(RIG *rig,
+ int ch);
extern HAMLIB_EXPORT(int)
-rig_mem_count HAMLIB_PARAMS((RIG *rig));
+rig_mem_count(RIG *rig);
HL_DEPRECATED
extern HAMLIB_EXPORT(int)
-rig_set_trn HAMLIB_PARAMS((RIG *rig,
- int trn));
+rig_set_trn(RIG *rig,
+ int trn);
HL_DEPRECATED
extern HAMLIB_EXPORT(int)
-rig_get_trn HAMLIB_PARAMS((RIG *rig,
- int *trn));
+rig_get_trn(RIG *rig,
+ int *trn);
extern HAMLIB_EXPORT(int)
-rig_set_freq_callback HAMLIB_PARAMS((RIG *,
- freq_cb_t,
- rig_ptr_t));
+rig_set_freq_callback(RIG *,
+ freq_cb_t,
+ rig_ptr_t);
extern HAMLIB_EXPORT(int)
-rig_set_mode_callback HAMLIB_PARAMS((RIG *,
- mode_cb_t,
- rig_ptr_t));
+rig_set_mode_callback(RIG *,
+ mode_cb_t,
+ rig_ptr_t);
extern HAMLIB_EXPORT(int)
-rig_set_vfo_callback HAMLIB_PARAMS((RIG *,
- vfo_cb_t,
- rig_ptr_t));
+rig_set_vfo_callback(RIG *,
+ vfo_cb_t,
+ rig_ptr_t);
extern HAMLIB_EXPORT(int)
-rig_set_ptt_callback HAMLIB_PARAMS((RIG *,
- ptt_cb_t,
- rig_ptr_t));
+rig_set_ptt_callback(RIG *,
+ ptt_cb_t,
+ rig_ptr_t);
extern HAMLIB_EXPORT(int)
-rig_set_dcd_callback HAMLIB_PARAMS((RIG *,
- dcd_cb_t,
- rig_ptr_t));
+rig_set_dcd_callback(RIG *,
+ dcd_cb_t,
+ rig_ptr_t);
extern HAMLIB_EXPORT(int)
-rig_set_pltune_callback HAMLIB_PARAMS((RIG *,
- pltune_cb_t,
- rig_ptr_t));
+rig_set_pltune_callback(RIG *,
+ pltune_cb_t,
+ rig_ptr_t);
extern HAMLIB_EXPORT(int)
-rig_set_spectrum_callback HAMLIB_PARAMS((RIG *,
- spectrum_cb_t,
- rig_ptr_t));
+rig_set_spectrum_callback(RIG *,
+ spectrum_cb_t,
+ rig_ptr_t);
extern HAMLIB_EXPORT(int)
-rig_set_twiddle HAMLIB_PARAMS((RIG *rig,
- int seconds));
+rig_set_twiddle(RIG *rig,
+ int seconds);
extern HAMLIB_EXPORT(int)
-rig_get_twiddle HAMLIB_PARAMS((RIG *rig,
- int *seconds));
+rig_get_twiddle(RIG *rig,
+ int *seconds);
extern HAMLIB_EXPORT(int)
-rig_set_uplink HAMLIB_PARAMS((RIG *rig,
- int val));
+rig_set_uplink(RIG *rig,
+ int val);
extern HAMLIB_EXPORT(const char *)
-rig_get_info HAMLIB_PARAMS((RIG *rig));
+rig_get_info(RIG *rig);
extern HAMLIB_EXPORT(struct rig_caps *)
-rig_get_caps HAMLIB_PARAMS((rig_model_t rig_model));
+rig_get_caps(rig_model_t rig_model);
extern HAMLIB_EXPORT(const freq_range_t *)
-rig_get_range HAMLIB_PARAMS((const freq_range_t *range_list,
- freq_t freq,
- rmode_t mode));
+rig_get_range(const freq_range_t *range_list,
+ freq_t freq,
+ rmode_t mode);
extern HAMLIB_EXPORT(pbwidth_t)
-rig_passband_normal HAMLIB_PARAMS((RIG *rig,
- rmode_t mode));
+rig_passband_normal(RIG *rig,
+ rmode_t mode);
extern HAMLIB_EXPORT(pbwidth_t)
-rig_passband_narrow HAMLIB_PARAMS((RIG *rig,
- rmode_t mode));
+rig_passband_narrow(RIG *rig,
+ rmode_t mode);
extern HAMLIB_EXPORT(pbwidth_t)
-rig_passband_wide HAMLIB_PARAMS((RIG *rig,
- rmode_t mode));
+rig_passband_wide(RIG *rig,
+ rmode_t mode);
extern HAMLIB_EXPORT(const char *)
-rigerror HAMLIB_PARAMS((int errnum));
+rigerror(int errnum);
extern HAMLIB_EXPORT(const char *)
-rigerror2 HAMLIB_PARAMS((int errnum));
+rigerror2(int errnum);
extern HAMLIB_EXPORT(int)
-rig_setting2idx HAMLIB_PARAMS((setting_t s));
+rig_setting2idx(setting_t s);
#define HAMLIB_SETTINGS_FILE "hamlib_settings"
@@ -3315,18 +3298,22 @@ rig_idx2setting(int i);
* Maybe "hamlib_" would have been better. Let me know. --SF
*/
extern HAMLIB_EXPORT(void)
-rig_set_debug HAMLIB_PARAMS((enum rig_debug_level_e debug_level));
+rig_set_debug(enum rig_debug_level_e debug_level);
extern HAMLIB_EXPORT(void)
-rig_get_debug HAMLIB_PARAMS((enum rig_debug_level_e *debug_level));
+rig_get_debug(enum rig_debug_level_e *debug_level);
extern HAMLIB_EXPORT(void)
-rig_set_debug_time_stamp HAMLIB_PARAMS((int flag));
+rig_set_debug_time_stamp(int flag);
#define rig_set_debug_level(level) rig_set_debug(level)
extern HAMLIB_EXPORT(int)
-rig_need_debug HAMLIB_PARAMS((enum rig_debug_level_e debug_level));
+rig_need_debug(enum rig_debug_level_e debug_level);
+
+extern HAMLIB_EXPORT(void)
+rig_debug(enum rig_debug_level_e debug_level,
+ const char *fmt, ...);
extern HAMLIB_EXPORT(void)add2debugmsgsave(const char *s);
@@ -3350,49 +3337,45 @@ extern HAMLIB_EXPORT_VAR(char) debugmsgsave3[DEBUGMSGSAVE_SIZE]; // last-2 debu
// use this instead of snprintf for automatic detection of buffer limit
#define SNPRINTF(s,n,...) { if (snprintf(s,n,##__VA_ARGS__) >= (n)) fprintf(stderr,"***** %s(%d): message truncated *****\n", __func__, __LINE__); }
-extern HAMLIB_EXPORT(void)
-rig_debug HAMLIB_PARAMS((enum rig_debug_level_e debug_level,
- const char *fmt, ...));
-
extern HAMLIB_EXPORT(vprintf_cb_t)
-rig_set_debug_callback HAMLIB_PARAMS((vprintf_cb_t cb,
- rig_ptr_t arg));
+rig_set_debug_callback(vprintf_cb_t cb,
+ rig_ptr_t arg);
extern HAMLIB_EXPORT(FILE *)
-rig_set_debug_file HAMLIB_PARAMS((FILE *stream));
+rig_set_debug_file(FILE *stream);
extern HAMLIB_EXPORT(int)
-rig_register HAMLIB_PARAMS((struct rig_caps *caps));
+rig_register(struct rig_caps *caps);
extern HAMLIB_EXPORT(int)
-rig_unregister HAMLIB_PARAMS((rig_model_t rig_model));
+rig_unregister(rig_model_t rig_model);
extern HAMLIB_EXPORT(int)
-rig_list_foreach HAMLIB_PARAMS((int (*cfunc)(const struct rig_caps *, rig_ptr_t),
- rig_ptr_t data));
+rig_list_foreach(int (*cfunc)(const struct rig_caps *, rig_ptr_t),
+ rig_ptr_t data);
extern HAMLIB_EXPORT(int)
-rig_list_foreach_model HAMLIB_PARAMS((int (*cfunc)(const rig_model_t rig_model, rig_ptr_t),
- rig_ptr_t data));
+rig_list_foreach_model(int (*cfunc)(const rig_model_t r...
[truncated message content] |
