From efeba2dfe0759704182e0072d35dd09a1e05b100 Mon Sep 17 00:00:00 2001 From: Mike Black W9MDB Date: Mon, 22 Jan 2024 10:50:30 -0600 Subject: [PATCH] Fix some more hamlib_token_t https://github.com/Hamlib/Hamlib/issues/1469 --- extra/gnuradio/gnuradio.cc | 4 ++-- extra/gnuradio/gnuradio.h | 4 ++-- rigs/aor/ar7030p.c | 2 +- rigs/dummy/amp_dummy.c | 2 +- rigs/dummy/tci1x.c | 8 ++++---- rigs/kit/usrp_impl.cc | 4 ++-- rigs/kit/usrp_impl.h | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/extra/gnuradio/gnuradio.cc b/extra/gnuradio/gnuradio.cc index e1b62aeb8..97177b3d7 100644 --- a/extra/gnuradio/gnuradio.cc +++ b/extra/gnuradio/gnuradio.cc @@ -160,7 +160,7 @@ int gr_init(RIG *rig) /* * Assumes rig!=NULL, rig->state.priv!=NULL */ -int gnuradio_set_conf(RIG *rig, token_t token, const char *val) +int gnuradio_set_conf(RIG *rig, hamlib_token_t token, const char *val) { struct gnuradio_priv_data *priv; struct rig_state *rs; @@ -184,7 +184,7 @@ int gnuradio_set_conf(RIG *rig, token_t token, const char *val) * Assumes rig!=NULL, rig->state.priv!=NULL * and val points to a buffer big enough to hold the conf value. */ -int gnuradio_get_conf(RIG *rig, token_t token, char *val) +int gnuradio_get_conf(RIG *rig, hamlib_token_t token, char *val) { struct gnuradio_priv_data *priv; struct rig_state *rs; diff --git a/extra/gnuradio/gnuradio.h b/extra/gnuradio/gnuradio.h index a071b0906..3a61d3197 100644 --- a/extra/gnuradio/gnuradio.h +++ b/extra/gnuradio/gnuradio.h @@ -44,8 +44,8 @@ int gr_get_vfo(RIG *rig, vfo_t *vfo); int gr_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width); int gr_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width); -int gnuradio_set_conf(RIG *rig, token_t token, const char *val); -int gnuradio_get_conf(RIG *rig, token_t token, char *val); +int gnuradio_set_conf(RIG *rig, hamlib_token_t token, const char *val); +int gnuradio_get_conf(RIG *rig, hamlib_token_t token, char *val); int gnuradio_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val); int gnuradio_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val); diff --git a/rigs/aor/ar7030p.c b/rigs/aor/ar7030p.c index 6d4757998..7c3b6279c 100644 --- a/rigs/aor/ar7030p.c +++ b/rigs/aor/ar7030p.c @@ -228,7 +228,7 @@ static struct ext_list *alloc_init_ext(const struct confparams *cfp) } #if 0 /* unused; re-enabled as needed. */ -static struct ext_list *find_ext(struct ext_list *elp, token_t token) +static struct ext_list *find_ext(struct ext_list *elp, hamlib_token_t token) { int i; diff --git a/rigs/dummy/amp_dummy.c b/rigs/dummy/amp_dummy.c index d72135942..36b701aad 100644 --- a/rigs/dummy/amp_dummy.c +++ b/rigs/dummy/amp_dummy.c @@ -276,7 +276,7 @@ static int dummy_amp_get_powerstat(AMP *amp, powerstat_t *status) } #if 0 // not implemented yet -static int dummy_amp_get_ext_level(AMP *amp, token_t token, value_t *val) +static int dummy_amp_get_ext_level(AMP *amp, hamlib_token_t token, value_t *val) { struct dummy_amp_priv_data *priv = (struct dummy_amp_priv_data *) amp->state.priv; diff --git a/rigs/dummy/tci1x.c b/rigs/dummy/tci1x.c index 86284fbe1..239a8e5c8 100644 --- a/rigs/dummy/tci1x.c +++ b/rigs/dummy/tci1x.c @@ -85,8 +85,8 @@ static int tci1x_get_split_freq_mode(RIG *rig, vfo_t vfo, freq_t *freq, static int tci1x_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val); static int tci1x_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val); -static int tci1x_set_ext_parm(RIG *rig, token_t token, value_t val); -static int tci1x_get_ext_parm(RIG *rig, token_t token, value_t *val); +static int tci1x_set_ext_parm(RIG *rig, hamlib_token_t token, value_t val); +static int tci1x_get_ext_parm(RIG *rig, hamlib_token_t token, value_t *val); #endif static const char *tci1x_get_info(RIG *rig); @@ -1944,7 +1944,7 @@ static int tci1x_mW2power(RIG *rig, float *power, unsigned int mwpower, } #ifdef XXNOTIMPLEMENTED -static int tci1x_set_ext_parm(RIG *rig, token_t token, value_t val) +static int tci1x_set_ext_parm(RIG *rig, hamlib_token_t token, value_t val) { struct tci1x_priv_data *priv = (struct tci1x_priv_data *)rig->state.priv; char lstr[64]; @@ -2021,7 +2021,7 @@ static int tci1x_set_ext_parm(RIG *rig, token_t token, value_t val) RETURNFUNC(RIG_OK); } -static int tci1x_get_ext_parm(RIG *rig, token_t token, value_t *val) +static int tci1x_get_ext_parm(RIG *rig, hamlib_token_t token, value_t *val) { struct tci1x_priv_data *priv = (struct tci1x_priv_data *)rig->state.priv; const struct confparams *cfp; diff --git a/rigs/kit/usrp_impl.cc b/rigs/kit/usrp_impl.cc index 646552215..c7f74befa 100644 --- a/rigs/kit/usrp_impl.cc +++ b/rigs/kit/usrp_impl.cc @@ -99,7 +99,7 @@ int usrp_close(RIG *rig) /* * Assumes rig!=NULL, rig->state.priv!=NULL */ -int usrp_set_conf(RIG *rig, token_t token, const char *val) +int usrp_set_conf(RIG *rig, hamlib_token_t token, const char *val) { struct usrp_priv_data *priv = static_castrig->state.priv; @@ -124,7 +124,7 @@ int usrp_set_conf(RIG *rig, token_t token, const char *val) * Assumes rig!=NULL, rig->state.priv!=NULL * and val points to a buffer big enough to hold the conf value. */ -int usrp_get_conf(RIG *rig, token_t token, char *val) +int usrp_get_conf(RIG *rig, hamlib_token_t token, char *val) { const struct usrp_priv_data *priv = static_castrig->state.priv; diff --git a/rigs/kit/usrp_impl.h b/rigs/kit/usrp_impl.h index a29ecb19a..ef427b13f 100644 --- a/rigs/kit/usrp_impl.h +++ b/rigs/kit/usrp_impl.h @@ -36,8 +36,8 @@ int usrp_open(RIG *rig); int usrp_close(RIG *rig); int usrp_set_freq(RIG *rig, vfo_t vfo, freq_t freq); int usrp_get_freq(RIG *rig, vfo_t vfo, freq_t *freq); -int usrp_set_conf(RIG *rig, token_t token, const char *val); -int usrp_get_conf(RIG *rig, token_t token, char *val); +int usrp_set_conf(RIG *rig, hamlib_token_t token, const char *val); +int usrp_get_conf(RIG *rig, hamlib_token_t token, char *val); const char * usrp_get_info(RIG *rig);