mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fix some more hamlib_token_t 

https://github.com/Hamlib/Hamlib/issues/1469
pull/1486/head
Mike Black W9MDB 2024-01-22 10:50:30 -06:00
rodzic 75cf467c1d
commit efeba2dfe0
7 zmienionych plików z 14 dodań i 14 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
extra/gnuradio/gnuradio.cc
Wyświetl plik

@ -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;

4
extra/gnuradio/gnuradio.h
Wyświetl plik

@ -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);

2
rigs/aor/ar7030p.c
Wyświetl plik

@ -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;

2
rigs/dummy/amp_dummy.c
Wyświetl plik

@ -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;

8
rigs/dummy/tci1x.c
Wyświetl plik

@ -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;

4
rigs/kit/usrp_impl.cc
Wyświetl plik

@ -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_cast<struct usrp_priv_data*>rig->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_cast<struct usrp_priv_data*>rig->state.priv;

4
rigs/kit/usrp_impl.h
Wyświetl plik

@ -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);