[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. e016025c04f66b75c7773
Library to control radio transceivers and receivers
Brought to you by:
n0nb
Menu
▾
▴
[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. e016025c04f66b75c7773fc747dc8fe57e7565b1
|
From: Nate B. <n0...@us...> - 2021-02-15 21:34:55
|
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 e016025c04f66b75c7773fc747dc8fe57e7565b1 (commit)
via fc890004f32fc60c104eefdc5506201f66a67cae (commit)
via ab34e83adc202f343994e7b20cb6bbd70de92e83 (commit)
via 003bc93dd0ad32c8426b11301f83306e6b0a46ff (commit)
via 665a6eabc00035429050c62094e66fd3e00c9f06 (commit)
via 9c4f77cc8105271d14ed0220881f2c6612e6d5be (commit)
from 779a00591cc879c4040a8d6039862416487b85ff (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 e016025c04f66b75c7773fc747dc8fe57e7565b1
Author: Michael Black W9MDB <mdb...@ya...>
Date: Mon Feb 15 08:53:41 2021 -0600
Add power functions to flrig.c
diff --git a/rigs/dummy/flrig.c b/rigs/dummy/flrig.c
index 11a5b2a9..7b69d628 100644
--- a/rigs/dummy/flrig.c
+++ b/rigs/dummy/flrig.c
@@ -91,6 +91,10 @@ static int flrig_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val);
static int flrig_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val);
static const char *flrig_get_info(RIG *rig);
+static int flrig_power2mW(RIG *rig, unsigned int *mwpower, float power,
+ freq_t freq, rmode_t mode);
+static int flrig_mW2power(RIG *rig, float *power, unsigned int mwpower,
+ freq_t freq, rmode_t mode);
struct flrig_priv_data
{
@@ -177,7 +181,9 @@ const struct rig_caps flrig_caps =
.set_split_freq_mode = flrig_set_split_freq_mode,
.get_split_freq_mode = flrig_get_split_freq_mode,
.set_level = flrig_set_level,
- .get_level = flrig_get_level
+ .get_level = flrig_get_level,
+ .power2mW = flrig_power2mW,
+ .mW2power = flrig_mW2power
};
// Structure for mapping flrig dynmamic modes to hamlib modes
@@ -2017,3 +2023,34 @@ static const char *flrig_get_info(RIG *rig)
return priv->info;
}
+
+static int flrig_power2mW(RIG *rig, unsigned int *mwpower, float power,
+ freq_t freq, rmode_t mode)
+{
+ struct flrig_priv_data *priv = (struct flrig_priv_data *) rig->state.priv;
+ ENTERFUNC;
+ rig_debug(RIG_DEBUG_TRACE, "%s: passed power = %f\n", __func__, power);
+ rig_debug(RIG_DEBUG_TRACE, "%s: passed freq = %"PRIfreq" Hz\n", __func__, freq);
+ rig_debug(RIG_DEBUG_TRACE, "%s: passed mode = %s\n", __func__,
+ rig_strrmode(mode));
+
+ power *= priv->powermeter_scale;
+ *mwpower = (power * 100000);
+
+ RETURNFUNC(RIG_OK);
+}
+
+static int flrig_mW2power(RIG *rig, float *power, unsigned int mwpower,
+ freq_t freq, rmode_t mode)
+{
+ ENTERFUNC;
+ rig_debug(RIG_DEBUG_TRACE, "%s: passed mwpower = %u\n", __func__, mwpower);
+ rig_debug(RIG_DEBUG_TRACE, "%s: passed freq = %"PRIfreq" Hz\n", __func__, freq);
+ rig_debug(RIG_DEBUG_TRACE, "%s: passed mode = %s\n", __func__,
+ rig_strrmode(mode));
+
+ *power = ((float)mwpower / 100000);
+
+ RETURNFUNC(RIG_OK);
+}
+
diff --git a/rigs/dummy/flrig.h b/rigs/dummy/flrig.h
index bcd35b6b..b2cccb69 100644
--- a/rigs/dummy/flrig.h
+++ b/rigs/dummy/flrig.h
@@ -28,7 +28,7 @@
#include <sys/time.h>
#endif
-#define BACKEND_VER "20210128"
+#define BACKEND_VER "20210215"
#define EOM "\r"
#define TRUE 1
commit fc890004f32fc60c104eefdc5506201f66a67cae
Author: Michael Black W9MDB <mdb...@ya...>
Date: Sun Feb 14 23:51:14 2021 -0600
Fix too verbose debug in serial.c
diff --git a/src/serial.c b/src/serial.c
index 81c59f94..9f58d66c 100644
--- a/src/serial.c
+++ b/src/serial.c
@@ -120,11 +120,11 @@ int is_uh_radio_fd(int fd)
{
if (uh_radio_fd >= 0 && uh_radio_fd == fd)
{
- RETURNFUNC( 1);
+ return ( 1);
}
else
{
- RETURNFUNC( 0);
+ return ( 0);
}
}
//! @endcond
commit ab34e83adc202f343994e7b20cb6bbd70de92e83
Author: Michael Black W9MDB <mdb...@ya...>
Date: Sun Feb 14 23:46:05 2021 -0600
RETURNFUNC ENTERFUNC for serial.c
https://github.com/Hamlib/Hamlib/issues/514
diff --git a/src/serial.c b/src/serial.c
index 421e75ca..81c59f94 100644
--- a/src/serial.c
+++ b/src/serial.c
@@ -120,11 +120,11 @@ int is_uh_radio_fd(int fd)
{
if (uh_radio_fd >= 0 && uh_radio_fd == fd)
{
- return 1;
+ RETURNFUNC( 1);
}
else
{
- return 0;
+ RETURNFUNC( 0);
}
}
//! @endcond
@@ -141,13 +141,15 @@ int HAMLIB_API serial_open(hamlib_port_t *rp)
int fd; /* File descriptor for the port */
int err;
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
if (!rp)
{
- return -RIG_EINVAL;
+ RETURNFUNC(-RIG_EINVAL);
}
+
+ rig_debug(RIG_DEBUG_VERBOSE, "%s: %s\n", __func__, rp->pathname);
if (!strncmp(rp->pathname, "uh-rig", 6))
{
/*
@@ -158,13 +160,13 @@ int HAMLIB_API serial_open(hamlib_port_t *rp)
*/
if (rp->parm.serial.parity != RIG_PARITY_NONE)
{
- return -RIG_EIO;
+ RETURNFUNC( -RIG_EIO);
}
if ((rp->parm.serial.handshake != RIG_HANDSHAKE_HARDWARE) &&
(rp->parm.serial.handshake != RIG_HANDSHAKE_NONE))
{
- return -RIG_EIO;
+ RETURNFUNC( -RIG_EIO);
}
/*
@@ -179,7 +181,7 @@ int HAMLIB_API serial_open(hamlib_port_t *rp)
if (fd == -1)
{
- return -RIG_EIO;
+ RETURNFUNC( -RIG_EIO);
}
rp->fd = fd;
@@ -215,7 +217,7 @@ int HAMLIB_API serial_open(hamlib_port_t *rp)
* from the transceiver will be returned to both applications.
*/
uh_radio_fd = fd;
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
}
/*
@@ -231,7 +233,7 @@ int HAMLIB_API serial_open(hamlib_port_t *rp)
__func__,
rp->pathname,
strerror(errno));
- return -RIG_EIO;
+ RETURNFUNC( -RIG_EIO);
}
rp->fd = fd;
@@ -241,13 +243,13 @@ int HAMLIB_API serial_open(hamlib_port_t *rp)
if (err != RIG_OK)
{
CLOSE(fd);
- return err;
+ RETURNFUNC( err);
}
serial_flush(rp); // ensure nothing is there when we open
hl_usleep(50 * 1000); // give a little time for MicroKeyer to finish
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
}
@@ -272,11 +274,11 @@ int HAMLIB_API serial_setup(hamlib_port_t *rp)
#endif
term_options_backup_t *term_backup = NULL;
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
if (!rp)
{
- return -RIG_EINVAL;
+ RETURNFUNC( -RIG_EINVAL);
}
fd = rp->fd;
@@ -367,7 +369,7 @@ int HAMLIB_API serial_setup(hamlib_port_t *rp)
rp->parm.serial.rate);
CLOSE(fd);
- return -RIG_ECONF;
+ RETURNFUNC( -RIG_ECONF);
}
/* TODO */
@@ -414,7 +416,7 @@ int HAMLIB_API serial_setup(hamlib_port_t *rp)
rp->parm.serial.data_bits);
CLOSE(fd);
- return -RIG_ECONF;
+ RETURNFUNC( -RIG_ECONF);
break;
}
@@ -439,7 +441,7 @@ int HAMLIB_API serial_setup(hamlib_port_t *rp)
rp->parm.serial.stop_bits);
CLOSE(fd);
- return -RIG_ECONF;
+ RETURNFUNC( -RIG_ECONF);
break;
}
@@ -485,7 +487,7 @@ int HAMLIB_API serial_setup(hamlib_port_t *rp)
rp->parm.serial.parity);
CLOSE(fd);
- return -RIG_ECONF;
+ RETURNFUNC( -RIG_ECONF);
break;
}
@@ -518,7 +520,7 @@ int HAMLIB_API serial_setup(hamlib_port_t *rp)
rp->parm.serial.handshake);
CLOSE(fd);
- return -RIG_ECONF;
+ RETURNFUNC( -RIG_ECONF);
break;
}
@@ -563,7 +565,7 @@ int HAMLIB_API serial_setup(hamlib_port_t *rp)
strerror(errno));
CLOSE(fd);
- return -RIG_ECONF; /* arg, so close! */
+ RETURNFUNC( -RIG_ECONF); /* arg, so close! */
}
#elif defined(HAVE_TERMIO_H)
@@ -578,7 +580,7 @@ int HAMLIB_API serial_setup(hamlib_port_t *rp)
strerror(errno));
CLOSE(fd);
- return -RIG_ECONF; /* arg, so close! */
+ RETURNFUNC( -RIG_ECONF); /* arg, so close! */
}
#else
@@ -594,7 +596,7 @@ int HAMLIB_API serial_setup(hamlib_port_t *rp)
strerror(errno));
CLOSE(fd);
- return -RIG_ECONF; /* arg, so close! */
+ RETURNFUNC( -RIG_ECONF); /* arg, so close! */
}
#endif
@@ -612,7 +614,7 @@ int HAMLIB_API serial_setup(hamlib_port_t *rp)
term_backup->next = term_options_backup_head;
term_options_backup_head = term_backup;
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
}
@@ -623,7 +625,7 @@ int HAMLIB_API serial_setup(hamlib_port_t *rp)
*/
int HAMLIB_API serial_flush(hamlib_port_t *p)
{
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
if (p->fd == uh_ptt_fd || p->fd == uh_radio_fd || p->flushx)
{
@@ -650,12 +652,12 @@ int HAMLIB_API serial_flush(hamlib_port_t *p)
rig_debug(RIG_DEBUG_TRACE, "read flushed %d bytes\n", nbytes);
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
}
rig_debug(RIG_DEBUG_VERBOSE, "tcflush%s\n", "");
tcflush(p->fd, TCIFLUSH);
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
}
@@ -703,7 +705,7 @@ int ser_open(hamlib_port_t *p)
}
p->fd = ret;
- return ret;
+ RETURNFUNC( ret);
}
@@ -730,7 +732,7 @@ int ser_close(hamlib_port_t *p)
uh_close_ptt();
uh_ptt_fd = -1;
p->fd = -1;
- return 0;
+ RETURNFUNC( 0);
}
if (p->fd == uh_radio_fd)
@@ -738,7 +740,7 @@ int ser_close(hamlib_port_t *p)
uh_close_radio();
uh_radio_fd = -1;
p->fd = -1;
- return 0;
+ RETURNFUNC( 0);
}
// Find backup termios options to restore before closing
@@ -812,7 +814,7 @@ int ser_close(hamlib_port_t *p)
rc = CLOSE(p->fd);
p->fd = -1;
- return rc;
+ RETURNFUNC( rc);
}
@@ -827,14 +829,14 @@ int HAMLIB_API ser_set_rts(hamlib_port_t *p, int state)
unsigned int y = TIOCM_RTS;
int rc;
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
rig_debug(RIG_DEBUG_VERBOSE, "%s: RTS=%d\n", __func__, state);
// ignore this for microHam ports
if (p->fd == uh_ptt_fd || p->fd == uh_radio_fd)
{
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
}
#if defined(TIOCMBIS) && defined(TIOCMBIC)
@@ -864,10 +866,10 @@ int HAMLIB_API ser_set_rts(hamlib_port_t *p, int state)
"%s: Cannot change RTS - %s\n",
__func__,
strerror(errno));
- return -RIG_EIO;
+ RETURNFUNC( -RIG_EIO);
}
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
}
@@ -881,18 +883,18 @@ int HAMLIB_API ser_get_rts(hamlib_port_t *p, int *state)
int retcode;
unsigned int y;
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
// cannot do this for microHam ports
if (p->fd == uh_ptt_fd || p->fd == uh_radio_fd)
{
- return -RIG_ENIMPL;
+ RETURNFUNC( -RIG_ENIMPL);
}
retcode = IOCTL(p->fd, TIOCMGET, &y);
*state = (y & TIOCM_RTS) == TIOCM_RTS;
- return retcode < 0 ? -RIG_EIO : RIG_OK;
+ RETURNFUNC( retcode < 0 ? -RIG_EIO : RIG_OK);
}
@@ -907,7 +909,7 @@ int HAMLIB_API ser_set_dtr(hamlib_port_t *p, int state)
unsigned int y = TIOCM_DTR;
int rc;
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
rig_debug(RIG_DEBUG_VERBOSE, "%s: DTR=%d\n", __func__, state);
@@ -915,13 +917,13 @@ int HAMLIB_API ser_set_dtr(hamlib_port_t *p, int state)
// but (un)set ptt on microHam PTT channel.
if (p->fd == uh_radio_fd)
{
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
}
if (p->fd == uh_ptt_fd)
{
uh_set_ptt(state);
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
}
#if defined(TIOCMBIS) && defined(TIOCMBIC)
@@ -951,10 +953,10 @@ int HAMLIB_API ser_set_dtr(hamlib_port_t *p, int state)
"%s: Cannot change DTR - %s\n",
__func__,
strerror(errno));
- return -RIG_EIO;
+ RETURNFUNC( -RIG_EIO);
}
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
}
@@ -968,24 +970,24 @@ int HAMLIB_API ser_get_dtr(hamlib_port_t *p, int *state)
int retcode;
unsigned int y;
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
// cannot do this for the RADIO port, return PTT state for the PTT port
if (p->fd == uh_ptt_fd)
{
*state = uh_get_ptt();
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
}
if (p->fd == uh_radio_fd)
{
- return -RIG_ENIMPL;
+ RETURNFUNC( -RIG_ENIMPL);
}
retcode = IOCTL(p->fd, TIOCMGET, &y);
*state = (y & TIOCM_DTR) == TIOCM_DTR;
- return retcode < 0 ? -RIG_EIO : RIG_OK;
+ RETURNFUNC( retcode < 0 ? -RIG_EIO : RIG_OK);
}
@@ -997,19 +999,19 @@ int HAMLIB_API ser_get_dtr(hamlib_port_t *p, int *state)
*/
int HAMLIB_API ser_set_brk(hamlib_port_t *p, int state)
{
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
// ignore this for microHam ports
if (p->fd == uh_ptt_fd || p->fd == uh_radio_fd)
{
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
}
#if defined(TIOCSBRK) && defined(TIOCCBRK)
- return IOCTL(p->fd, state ? TIOCSBRK : TIOCCBRK, 0) < 0 ?
- -RIG_EIO : RIG_OK;
+ RETURNFUNC( IOCTL(p->fd, state ? TIOCSBRK : TIOCCBRK, 0) < 0 ?
+ -RIG_EIO : RIG_OK;)
#else
- return -RIG_ENIMPL;
+ RETURNFUNC( -RIG_ENIMPL);
#endif
}
@@ -1024,18 +1026,18 @@ int HAMLIB_API ser_get_car(hamlib_port_t *p, int *state)
int retcode;
unsigned int y;
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
// cannot do this for microHam ports
if (p->fd == uh_ptt_fd || p->fd == uh_radio_fd)
{
- return -RIG_ENIMPL;
+ RETURNFUNC( -RIG_ENIMPL);
}
retcode = IOCTL(p->fd, TIOCMGET, &y);
*state = (y & TIOCM_CAR) == TIOCM_CAR;
- return retcode < 0 ? -RIG_EIO : RIG_OK;
+ RETURNFUNC( retcode < 0 ? -RIG_EIO : RIG_OK);
}
@@ -1049,18 +1051,18 @@ int HAMLIB_API ser_get_cts(hamlib_port_t *p, int *state)
int retcode;
unsigned int y;
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
// cannot do this for microHam ports
if (p->fd == uh_ptt_fd || p->fd == uh_radio_fd)
{
- return -RIG_ENIMPL;
+ RETURNFUNC( -RIG_ENIMPL);
}
retcode = IOCTL(p->fd, TIOCMGET, &y);
*state = (y & TIOCM_CTS) == TIOCM_CTS;
- return retcode < 0 ? -RIG_EIO : RIG_OK;
+ RETURNFUNC( retcode < 0 ? -RIG_EIO : RIG_OK);
}
@@ -1074,18 +1076,18 @@ int HAMLIB_API ser_get_dsr(hamlib_port_t *p, int *state)
int retcode;
unsigned int y;
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+ ENTERFUNC;
// cannot do this for microHam ports
if (p->fd == uh_ptt_fd || p->fd == uh_radio_fd)
{
- return -RIG_ENIMPL;
+ RETURNFUNC( -RIG_ENIMPL);
}
retcode = IOCTL(p->fd, TIOCMGET, &y);
*state = (y & TIOCM_DSR) == TIOCM_DSR;
- return retcode < 0 ? -RIG_EIO : RIG_OK;
+ RETURNFUNC( retcode < 0 ? -RIG_EIO : RIG_OK);
}
/** @} */
commit 003bc93dd0ad32c8426b11301f83306e6b0a46ff
Author: Michael Black W9MDB <mdb...@ya...>
Date: Sun Feb 14 16:46:41 2021 -0600
Add RETURNFUNC to kenwood.c
https://github.com/Hamlib/Hamlib/issues/514
diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c
index 6d38b120..48427e84 100644
--- a/rigs/kenwood/kenwood.c
+++ b/rigs/kenwood/kenwood.c
@@ -245,7 +245,7 @@ int kenwood_transaction(RIG *rig, const char *cmdstr, char *data,
if ((!cmdstr && !datasize) || (datasize && !data))
{
- return -RIG_EINVAL;
+ RETURNFUNC( -RIG_EINVAL);
}
rs = &rig->state;
@@ -268,7 +268,7 @@ int kenwood_transaction(RIG *rig, const char *cmdstr, char *data,
if (data) { strncpy(data, priv->last_if_response, datasize); }
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
}
// else we drop through and do the real IF command
@@ -554,7 +554,7 @@ transaction_quit:
rs->hold_decode = 0;
rig_debug(RIG_DEBUG_TRACE, "%s: returning retval=%d\n", __func__, retval);
- return retval;
+ RETURNFUNC( retval);
}
@@ -585,7 +585,7 @@ int kenwood_safe_transaction(RIG *rig, const char *cmd, char *buf,
if (!cmd)
{
- return -RIG_EINVAL;
+ RETURNFUNC( -RIG_EINVAL);
}
memset(buf, 0, buf_size);
@@ -605,7 +605,7 @@ int kenwood_safe_transaction(RIG *rig, const char *cmd, char *buf,
if (err != RIG_OK) /* return immediately on error as any
retries handled at lower level */
{
- return err;
+ RETURNFUNC( err);
}
length = strlen(buf);
@@ -624,7 +624,7 @@ int kenwood_safe_transaction(RIG *rig, const char *cmd, char *buf,
}
while (err != RIG_OK && ++retry < rig->state.rigport.retry);
- return err;
+ RETURNFUNC( err);
}
rmode_t kenwood2rmode(unsigned char mode, const rmode_t mode_table[])
@@ -633,10 +633,10 @@ rmode_t kenwood2rmode(unsigned char mode, const rmode_t mode_table[])
if (mode >= KENWOOD_MODE_TABLE_MAX)
{
- return RIG_MODE_NONE;
+ RETURNFUNC( RIG_MODE_NONE);
}
- return mode_table[mode];
+ RETURNFUNC( mode_table[mode]);
}
char rmode2kenwood(rmode_t mode, const rmode_t mode_table[])
@@ -653,12 +653,12 @@ char rmode2kenwood(rmode_t mode, const rmode_t mode_table[])
if (mode_table[i] == mode)
{
rig_debug(RIG_DEBUG_VERBOSE, "%s: returning %d\n", __func__, i);
- return i;
+ RETURNFUNC( i);
}
}
}
- return -1;
+ RETURNFUNC( -1);
}
int kenwood_init(RIG *rig)
@@ -673,7 +673,7 @@ int kenwood_init(RIG *rig)
if (rig->state.priv == NULL)
{
- return -RIG_ENOMEM;
+ RETURNFUNC( -RIG_ENOMEM);
}
priv = rig->state.priv;
@@ -715,7 +715,7 @@ int kenwood_init(RIG *rig)
rig_debug(RIG_DEBUG_TRACE, "%s: if_len = %d\n", __func__, caps->if_len);
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
}
int kenwood_cleanup(RIG *rig)
@@ -725,7 +725,7 @@ int kenwood_cleanup(RIG *rig)
free(rig->state.priv);
rig->state.priv = NULL;
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
}
int kenwood_open(RIG *rig)
@@ -798,7 +798,7 @@ int kenwood_open(RIG *rig)
{
rig_debug(RIG_DEBUG_ERR, "%s: cannot get f/w version\n", __func__);
rig->state.rigport.retry = retry_save;
- return err;
+ RETURNFUNC( err);
}
/* store the data after the "FV" which should be a f/w version
@@ -814,7 +814,7 @@ int kenwood_open(RIG *rig)
{
rig_debug(RIG_DEBUG_ERR, "%s: cannot get f/w version\n", __func__);
rig->state.rigport.retry = retry_save;
- return -RIG_EPROTO;
+ RETURNFUNC( -RIG_EPROTO);
}
rig_debug(RIG_DEBUG_TRACE, "%s: found f/w version %s\n", __func__,
@@ -832,7 +832,7 @@ int kenwood_open(RIG *rig)
{
rig_debug(RIG_DEBUG_ERR, "%s: no response from rig\n", __func__);
rig->state.rigport.retry = retry_save;
- return err;
+ RETURNFUNC( err);
}
/* here we know there is something that responds to FA but not
@@ -849,7 +849,7 @@ int kenwood_open(RIG *rig)
{
rig_debug(RIG_DEBUG_ERR, "%s: cannot get identification\n", __func__);
rig->state.rigport.retry = retry_save;
- return err;
+ RETURNFUNC( err);
}
}
@@ -858,7 +858,7 @@ int kenwood_open(RIG *rig)
{
rig_debug(RIG_DEBUG_ERR, "%s: unknown id type (%s)\n", __func__, id);
rig->state.rigport.retry = retry_save;
- return -RIG_EPROTO;
+ RETURNFUNC( -RIG_EPROTO);
}
if (!strcmp("IDID900", id) /* DDUtil in TS-2000 mode */
@@ -927,7 +927,7 @@ int kenwood_open(RIG *rig)
}
rig->state.rigport.retry = retry_save;
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
}
/* driver mismatch */
@@ -948,7 +948,7 @@ int kenwood_open(RIG *rig)
// mismatched IDs can still be tested
rig->state.rigport.retry = retry_save;
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
}
@@ -965,7 +965,7 @@ int kenwood_close(RIG *rig)
it's not supported */
}
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
}
@@ -979,7 +979,7 @@ int kenwood_get_id(RIG *rig, char *buf)
{
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
- return kenwood_transaction(rig, "ID", buf, KENWOOD_MAX_BUF_LEN);
+ RETURNFUNC( kenwood_transaction(rig, "ID", buf, KENWOOD_MAX_BUF_LEN));
}
@@ -994,8 +994,8 @@ static int kenwood_get_if(RIG *rig)
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
- return kenwood_safe_transaction(rig, "IF", priv->info,
- KENWOOD_MAX_BUF_LEN, caps->if_len);
+ RETURNFUNC( kenwood_safe_transaction(rig, "IF", priv->info,
+ KENWOOD_MAX_BUF_LEN, caps->if_len);)
}
@@ -1019,7 +1019,7 @@ int kenwood_set_vfo(RIG *rig, vfo_t vfo)
* This prevents a 1.8 second delay in PowerSDR when switching VFOs
* We'll do this once if curr_mode has not been set yet
*/
- if (priv->is_emulation && priv->curr_mode > 0) { return RIG_OK; }
+ if (priv->is_emulation && priv->curr_mode > 0) { RETURNFUNC( RIG_OK; )}
switch (vfo)
{
@@ -1036,11 +1036,11 @@ int kenwood_set_vfo(RIG *rig, vfo_t vfo)
break;
case RIG_VFO_CURR:
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported VFO %s\n", __func__, rig_strvfo(vfo));
- return -RIG_EINVAL;
+ RETURNFUNC( -RIG_EINVAL);
}
//if rig=ts2000 then check Satellite mode status
@@ -1054,7 +1054,7 @@ int kenwood_set_vfo(RIG *rig, vfo_t vfo)
if (retval != RIG_OK)
{
- return retval;
+ RETURNFUNC( retval);
}
rig_debug(RIG_DEBUG_VERBOSE, "%s: satellite mode status %s\n", __func__,
@@ -1065,7 +1065,7 @@ int kenwood_set_vfo(RIG *rig, vfo_t vfo)
{
//SAT mode doesn't allow FR command (cannot select VFO)
//selecting VFO is useless in SAT MODE
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
}
}
@@ -1081,19 +1081,19 @@ int kenwood_set_vfo(RIG *rig, vfo_t vfo)
if (retval != RIG_OK)
{
- return retval;
+ RETURNFUNC( retval);
}
/* if FN command then there's no FT or FR */
/* If split mode on, the don't change TxVFO */
if ('N' == cmdbuf[1] || priv->split != RIG_SPLIT_OFF)
{
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
}
/* set TX VFO */
cmdbuf[1] = 'T';
- return kenwood_transaction(rig, cmdbuf, NULL, 0);
+ RETURNFUNC( kenwood_transaction(rig, cmdbuf, NULL, 0));
}
@@ -1120,15 +1120,15 @@ int kenwood_set_vfo_main_sub(RIG *rig, vfo_t vfo)
break;
case RIG_VFO_CURR:
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported VFO %s\n", __func__, rig_strvfo(vfo));
- return -RIG_EINVAL;
+ RETURNFUNC( -RIG_EINVAL);
}
snprintf(cmdbuf, sizeof(cmdbuf), "CB%c", vfo_function);
- return kenwood_transaction(rig, cmdbuf, NULL, 0);
+ RETURNFUNC( kenwood_transaction(rig, cmdbuf, NULL, 0));
}
@@ -1145,7 +1145,7 @@ int kenwood_get_vfo_main_sub(RIG *rig, vfo_t *vfo)
if (!vfo)
{
- return -RIG_EINVAL;
+ RETURNFUNC( -RIG_EINVAL);
}
if (RIG_OK == (rc = kenwood_safe_transaction(rig, "CB", buf, sizeof(buf), 3)))
@@ -1153,7 +1153,7 @@ int kenwood_get_vfo_main_sub(RIG *rig, vfo_t *vfo)
*vfo = buf[2] == '1' ? RIG_VFO_SUB : RIG_VFO_MAIN;
}
- return rc;
+ RETURNFUNC( rc);
}
@@ -1177,11 +1177,11 @@ int kenwood_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t txvfo)
// Rx MAIN/Tx SUB is the only split method
retval = kenwood_set_vfo_main_sub(rig, RIG_VFO_MAIN);
- if (retval != RIG_OK) { return retval; }
+ if (retval != RIG_OK) { RETURNFUNC( retval; )}
}
snprintf(cmdbuf, sizeof(cmdbuf), "TB%c", RIG_SPLIT_ON == split ? '1' : '0');
- return kenwood_transaction(rig, cmdbuf, NULL, 0);
+ RETURNFUNC( kenwood_transaction(rig, cmdbuf, NULL, 0));
}
if (vfo != RIG_VFO_CURR)
@@ -1196,7 +1196,7 @@ int kenwood_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t txvfo)
default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported VFO %s\n", __func__, rig_strvfo(vfo));
- return -RIG_EINVAL;
+ RETURNFUNC( -RIG_EINVAL);
}
/* set RX VFO */
@@ -1205,7 +1205,7 @@ int kenwood_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t txvfo)
if (retval != RIG_OK)
{
- return retval;
+ RETURNFUNC( retval);
}
}
@@ -1220,7 +1220,7 @@ int kenwood_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t txvfo)
if (retval != RIG_OK)
{
- return retval;
+ RETURNFUNC( retval);
}
}
}
@@ -1237,7 +1237,7 @@ int kenwood_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t txvfo)
default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported VFO %s\n", __func__,
rig_strvfo(txvfo));
- return -RIG_EINVAL;
+ RETURNFUNC( -RIG_EINVAL);
}
priv->tx_vfo = txvfo;
@@ -1249,7 +1249,7 @@ int kenwood_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t txvfo)
if (RIG_OK == (retval = kenwood_safe_transaction(rig, "FT", cmdbuf,
sizeof(cmdbuf), 3)))
{
- if (cmdbuf[2] == vfo_function) { return RIG_OK; }
+ if (cmdbuf[2] == vfo_function) { RETURNFUNC( RIG_OK; )}
}
}
@@ -1259,13 +1259,13 @@ int kenwood_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t txvfo)
if (retval != RIG_OK)
{
- return retval;
+ RETURNFUNC( retval);
}
/* Remember whether split is on, for kenwood_set_vfo */
priv->split = split;
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
}
@@ -1287,7 +1287,7 @@ int kenwood_set_split(RIG *rig, vfo_t vfo, split_t split, vfo_t txvfo)
if (retval != RIG_OK)
{
- return retval;
+ RETURNFUNC( retval);
}
/* Remember whether split is on, for kenwood_set_vfo */
@@ -1296,7 +1296,7 @@ int kenwood_set_split(RIG *rig, vfo_t vfo, split_t split, vfo_t txvfo)
rig_debug(RIG_DEBUG_VERBOSE, "%s: priv->tx_vfo=%s\n", __func__,
rig_strvfo(priv->tx_vfo));
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
}
@@ -1316,7 +1316,7 @@ int kenwood_get_split_vfo_if(RIG *rig, vfo_t rxvfo, split_t *split,
if (!split || !txvfo)
{
- return -RIG_EINVAL;
+ RETURNFUNC( -RIG_EINVAL);
}
if (RIG_IS_TS990S)
@@ -1340,14 +1340,14 @@ int kenwood_get_split_vfo_if(RIG *rig, vfo_t rxvfo, split_t *split,
}
}
- return retval;
+ RETURNFUNC( retval);
}
retval = kenwood_get_if(rig);
if (retval != RIG_OK)
{
- return retval;
+ RETURNFUNC( retval);
}
switch (priv->info[32])
@@ -1363,7 +1363,7 @@ int kenwood_get_split_vfo_if(RIG *rig, vfo_t rxvfo, split_t *split,
default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported split %c\n",
__func__, priv->info[32]);
- return -RIG_EPROTO;
+ RETURNFUNC( -RIG_EPROTO);
}
/* Remember whether split is on, for kenwood_set_vfo */
@@ -1391,13 +1391,13 @@ int kenwood_get_split_vfo_if(RIG *rig, vfo_t rxvfo, split_t *split,
default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported VFO %c\n",
__func__, priv->info[30]);
- return -RIG_EPROTO;
+ RETURNFUNC( -RIG_EPROTO);
}
priv->tx_vfo = *txvfo;
rig_debug(RIG_DEBUG_VERBOSE, "%s: priv->tx_vfo=%s\n", __func__,
rig_strvfo(priv->tx_vfo));
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
}
@@ -1418,14 +1418,14 @@ int kenwood_get_vfo_if(RIG *rig, vfo_t *vfo)
if (!vfo)
{
- return -RIG_EINVAL;
+ RETURNFUNC( -RIG_EINVAL);
}
retval = kenwood_get_if(rig);
if (retval != RIG_OK)
{
- return retval;
+ RETURNFUNC( retval);
}
/* Elecraft info[30] does not track split VFO when transmitting */
@@ -1456,12 +1456,12 @@ int kenwood_get_vfo_if(RIG *rig, vfo_t *vfo)
default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported VFO %c\n",
__func__, priv->info[30]);
- return -RIG_EPROTO;
+ RETURNFUNC( -RIG_EPROTO);
}
rig_debug(RIG_DEBUG_VERBOSE, "%s: priv->tx_vfo=%s\n", __func__,
rig_strvfo(priv->tx_vfo));
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
}
@@ -1489,7 +1489,7 @@ int kenwood_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
/* fetch from rig */
err = rig_get_vfo(rig, &tvfo);
- if (RIG_OK != err) { return err; }
+ if (RIG_OK != err) { RETURNFUNC( err; )}
}
switch (tvfo)
@@ -1521,7 +1521,7 @@ int kenwood_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported VFO %s\n", __func__, rig_strvfo(vfo));
- return -RIG_EINVAL;
+ RETURNFUNC( -RIG_EINVAL);
}
// cppcheck-suppress *
@@ -1549,7 +1549,7 @@ int kenwood_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
if (RIG_OK != err)
{
- return err;
+ RETURNFUNC( err);
}
if ('1' == priv->info[32] && priv->info[30] != ('A' == vfo_letter ? '0' : '1'))
@@ -1562,14 +1562,14 @@ int kenwood_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
if (RIG_OK != err)
{
- return err;
+ RETURNFUNC( err);
}
err = kenwood_transaction(rig, freqbuf, NULL, 0);
}
}
- return err;
+ RETURNFUNC( err);
}
int kenwood_get_freq_if(RIG *rig, vfo_t vfo, freq_t *freq)
@@ -1582,21 +1582,21 @@ int kenwood_get_freq_if(RIG *rig, vfo_t vfo, freq_t *freq)
if (!freq)
{
- return -RIG_EINVAL;
+ RETURNFUNC( -RIG_EINVAL);
}
retval = kenwood_get_if(rig);
if (retval != RIG_OK)
{
- return retval;
+ RETURNFUNC( retval);
}
memcpy(freqbuf, priv->info, 15);
freqbuf[14] = '\0';
sscanf(freqbuf + 2, "%"SCNfreq, freq);
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
}
/*
@@ -1615,7 +1615,7 @@ int kenwood_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
if (!freq)
{
- return -RIG_EINVAL;
+ RETURNFUNC( -RIG_EINVAL);
}
tvfo = (vfo == RIG_VFO_CURR
@@ -1626,14 +1626,14 @@ int kenwood_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
/* fetch from rig */
retval = rig_get_vfo(rig, &tvfo);
- if (RIG_OK != retval) { return retval; }
+ if (RIG_OK != retval) { RETURNFUNC( retval; )}
}
/* memory frequency cannot be read with an Fx command, use IF */
if (tvfo == RIG_VFO_MEM)
{
- return kenwood_get_freq_if(rig, vfo, freq);
+ RETURNFUNC( kenwood_get_freq_if(rig, vfo, freq));
}
switch (tvfo)
@@ -1660,7 +1660,7 @@ int kenwood_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported VFO %s\n", __func__, rig_strvfo(vfo));
- return -RIG_EINVAL;
+ RETURNFUNC( -RIG_EINVAL);
}
snprintf(cmdbuf, sizeof(cmdbuf), "F%c", vfo_letter);
@@ -1669,12 +1669,12 @@ int kenwood_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
if (retval != RIG_OK)
{
- return retval;
+ RETURNFUNC( retval);
}
sscanf(freqbuf + 2, "%"SCNfreq, freq);
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
}
int kenwood_get_rit(RIG *rig, vfo_t vfo, shortfreq_t *rit)
@@ -1687,14 +1687,14 @@ int kenwood_get_rit(RIG *rig, vfo_t vfo, shortfreq_t *rit)
if (!rit)
{
- return -RIG_EINVAL;
+ RETURNFUNC( -RIG_EINVAL);
}
retval = kenwood_get_if(rig);
if (retval != RIG_OK)
{
- return retval;
+ RETURNFUNC( retval);
}
memcpy(buf, &priv->info[17], 6);
@@ -1702,7 +1702,7 @@ int kenwood_get_rit(RIG *rig, vfo_t vfo, shortfreq_t *rit)
buf[6] = '\0';
*rit = atoi(buf);
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
}
/*
@@ -1724,7 +1724,7 @@ int kenwood_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit)
if (retval != RIG_OK)
{
- return retval;
+ RETURNFUNC( retval);
}
if (priv->has_rit2) // if backend shows it has the Set 2 command
@@ -1739,10 +1739,10 @@ int kenwood_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit)
if (retval != RIG_OK)
{
- return retval;
+ RETURNFUNC( retval);
}
- if (rit == 0) { return RIG_OK; } // we're done here
+ if (rit == 0) { RETURNFUNC( RIG_OK;) } // we're done her))e
snprintf(buf, sizeof(buf), "R%c", (rit > 0) ? 'U' : 'D');
@@ -1755,7 +1755,7 @@ int kenwood_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit)
}
}
- return retval;
+ RETURNFUNC( retval);
}
/*
@@ -1765,14 +1765,14 @@ int kenwood_get_xit(RIG *rig, vfo_t vfo, shortfreq_t *rit)
{
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
- return kenwood_get_rit(rig, vfo, rit);
+ RETURNFUNC( kenwood_get_rit(rig, vfo, rit));
}
int kenwood_set_xit(RIG *rig, vfo_t vfo, shortfreq_t rit)
{
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
- return kenwood_set_rit(rig, vfo, rit);
+ RETURNFUNC( kenwood_set_rit(rig, vfo, rit));
}
int kenwood_scan(RIG *rig, vfo_t vfo, scan_t scan, int ch)
@@ -1781,12 +1781,11 @@ int kenwood_scan(RIG *rig, vfo_t vfo, scan_t scan, int ch)
if (RIG_IS_TS990S)
{
- return kenwood_transaction(rig, scan == RIG_SCAN_STOP ? "SC00" : "SC01", NULL,
- 0);
+ RETURNFUNC( kenwood_transaction(rig, scan == RIG_SCAN_STOP ? "SC00" : "SC01", NULL, 0));
}
else
{
- return kenwood_transaction(rig, scan == RIG_SCAN_STOP ? "SC0" : "SC1", NULL, 0);
+ RETURNFUNC( kenwood_transaction(rig, scan == RIG_SCAN_STOP ? "SC0" : "SC1", NULL, 0));
}
}
@@ -1828,7 +1827,7 @@ static int kenwood_set_filter(RIG *rig, pbwidth_t width)
cmd = "FL002002";
}
- return kenwood_transaction(rig, cmd, NULL, 0);
+ RETURNFUNC( kenwood_transaction(rig, cmd, NULL, 0));
}
/*
@@ -1887,7 +1886,7 @@ int kenwood_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
{
rig_debug(RIG_DEBUG_WARN, "%s: unsupported mode '%s'\n",
__func__, rig_strrmode(mode));
- return -RIG_EINVAL;
+ RETURNFUNC( -RIG_EINVAL);
}
if (kmode <= 9)
@@ -1912,13 +1911,13 @@ int kenwood_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
vfo_t curr_vfo;
err = kenwood_get_vfo_main_sub(rig, &curr_vfo);
- if (err != RIG_OK) { return err; }
+ if (err != RIG_OK) { RETURNFUNC( err; )}
if (vfo != RIG_VFO_CURR && vfo != curr_vfo)
{
err = kenwood_set_vfo_main_sub(rig, vfo);
- if (err != RIG_OK) { return err; }
+ if (err != RIG_OK) { RETURNFUNC( err; )}
}
snprintf(buf, sizeof(buf), "OM0%c", c); /* target vfo is ignored */
@@ -1928,7 +1927,7 @@ int kenwood_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
{
int err2 = kenwood_set_vfo_main_sub(rig, curr_vfo);
- if (err2 != RIG_OK) { return err2; }
+ if (err2 != RIG_OK) { RETURNFUNC( err2; )}
}
}
else
@@ -1937,7 +1936,7 @@ int kenwood_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
err = kenwood_transaction(rig, buf, NULL, 0);
}
- if (err != RIG_OK) { return err; }
+ if (err != RIG_OK) { RETURNFUNC( err; )}
if (RIG_IS_TS590S || RIG_IS_TS590SG || RIG_IS_TS950S || RIG_IS_TS950SDX)
{
@@ -1958,11 +1957,11 @@ int kenwood_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
snprintf(buf, sizeof(buf), "%s%c", data_cmd, data_mode);
err = kenwood_transaction(rig, buf, NULL, 0);
- if (err != RIG_OK) { return err; }
+ if (err != RIG_OK) { RETURNFUNC( err; )}
}
}
- if (RIG_PASSBAND_NOCHANGE == width) { return RIG_OK; }
+ if (RIG_PASSBAND_NOCHANGE == width) { RETURNFUNC( RIG_OK; )}
if (RIG_IS_TS450S || RIG_IS_TS690S || RIG_IS_TS850 || RIG_IS_TS950S
|| RIG_IS_TS950SDX)
@@ -1977,7 +1976,7 @@ int kenwood_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
/* non fatal */
}
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
}
static int kenwood_get_filter(RIG *rig, pbwidth_t *width)
@@ -1989,14 +1988,14 @@ static int kenwood_get_filter(RIG *rig, pbwidth_t *width)
if (!width)
{
- return -RIG_EINVAL;
+ RETURNFUNC( -RIG_EINVAL);
}
err = kenwood_safe_transaction(rig, "FL", buf, sizeof(buf), 8);
if (err != RIG_OK)
{
- return err;
+ RETURNFUNC( err);
}
f2 = atoi(&buf[5]);
@@ -2037,7 +2036,7 @@ static int kenwood_get_filter(RIG *rig, pbwidth_t *width)
break;
}
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
}
/*
@@ -2058,7 +2057,7 @@ int kenwood_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
if (!mode || !width)
{
- return -RIG_EINVAL;
+ RETURNFUNC( -RIG_EINVAL);
}
/* for emulation do not read mode from VFOB as it is copy of VFOA */
@@ -2066,7 +2065,7 @@ int kenwood_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
/* only need to get it if it has to be initialized */
if (priv->curr_mode > 0 && priv->is_emulation && vfo == RIG_VFO_B)
{
- return priv->curr_mode;
+ RETURNFUNC( priv->curr_mode);
}
if (RIG_IS_TS990S)
@@ -2077,7 +2076,7 @@ int kenwood_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
{
if (RIG_OK != (retval = kenwood_get_vfo_main_sub(rig, &vfo)))
{
- return retval;
+ RETURNFUNC( retval);
}
}
@@ -2089,7 +2088,7 @@ int kenwood_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported VFO %s\n", __func__, rig_strvfo(vfo));
- return -RIG_EINVAL;
+ RETURNFUNC( -RIG_EINVAL);
}
snprintf(cmd, sizeof(cmd), "OM%c", c);
@@ -2105,7 +2104,7 @@ int kenwood_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
if (retval != RIG_OK)
{
- return retval;
+ RETURNFUNC( retval);
}
if (modebuf[offs] <= '9')
@@ -2135,7 +2134,7 @@ int kenwood_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
if (retval != RIG_OK)
{
- return retval;
+ RETURNFUNC( retval);
}
if ('1' == modebuf[2])
@@ -2156,7 +2155,7 @@ int kenwood_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
/* XXX ? */
*width = rig_passband_normal(rig, *mode);
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
}
/* This is used when the radio does not support MD; for mode reading */
@@ -2170,14 +2169,14 @@ int kenwood_get_mode_if(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
if (!mode || !width)
{
- return -RIG_EINVAL;
+ RETURNFUNC( -RIG_EINVAL);
}
err = kenwood_get_if(rig);
if (err != RIG_OK)
{
- return err;
+ RETURNFUNC( err);
}
*mode = kenwood2rmode(priv->info[29] - '0', caps->mode_table);
@@ -2192,7 +2191,7 @@ int kenwood_get_mode_if(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
/* non fatal */
}
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
}
/* kenwood_get_micgain_minmax
@@ -2219,7 +2218,7 @@ static int kenwood_get_micgain_minmax(RIG *rig, int *micgain_now,
rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __func__);
retval = write_block(&rs->rigport, cmd, strlen(cmd));
- if (retval != RIG_OK) { return retval; }
+ if (retval != RIG_OK) { RETURNFUNC( retval; )}
retval = read_string(&rs->rigport, levelbuf, sizeof(levelbuf), NULL, 0);
@@ -2229,7 +2228,7 @@ static int kenwood_get_micgain_minmax(RIG *rig, int *micgain_now,
{
rig_debug(RIG_DEBUG_ERR, "%s: expected 19, got %d in '%s'\n", __func__, retval,
levelbuf);
- return -RIG_EPROTO;
+ RETURNFUNC( -RIG_EPROTO);
}
n = sscanf(levelbuf, "MG%d;MG%d;MG%d", micgain_now, micgain_min, micgain_max);
@@ -2238,19 +2237,19 @@ static int kenwood_get_micgain_minmax(RIG *rig, int *micgain_now,
{
rig_debug(RIG_DEBUG_ERR, "%s: count not parse 3 values from '%s'\n", __func__,
levelbuf);
- return -RIG_EPROTO;
+ RETURNFUNC( -RIG_EPROTO);
}
if (restore)
{
snprintf(levelbuf, sizeof(levelbuf), "MG%03d;", *micgain_now);
retval = kenwood_transaction(rig, levelbuf, NULL, 0);
- return retval;
+ RETURNFUNC( retval);
}
rig_debug(RIG_DEBUG_TRACE, "%s: returning now=%d, min=%d, max=%d\n", __func__,
*micgain_now, *micgain_min, *micgain_max);
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
}
/* kenwood_get_power_minmax
@@ -2309,12 +2308,12 @@ static int kenwood_get_power_minmax(RIG *rig, int *power_now, int *power_min,
*power_now = rig->state.power_now;
*power_min = rig->state.power_min;
*power_max = rig->state.power_max;
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
}
retval = write_block(&rs->rigport, cmd, strlen(cmd));
- if (retval != RIG_OK) { return retval; }
+ if (retval != RIG_OK) { RETURNFUNC( retval; )}
retval = read_string(&rs->rigport, levelbuf, sizeof(levelbuf), NULL, 0);
@@ -2334,7 +2333,7 @@ static int kenwood_get_power_minmax(RIG *rig, int *power_now, int *power_min,
rig_debug(RIG_DEBUG_ERR, "%s: expected %d, got %d in '%s'\n", __func__, expval,
retval,
levelbuf);
- return -RIG_EPROTO;
+ RETURNFUNC( -RIG_EPROTO);
}
if (RIG_IS_TS890S)
@@ -2345,7 +2344,7 @@ static int kenwood_get_power_minmax(RIG *rig, int *power_now, int *power_min,
{
rig_debug(RIG_DEBUG_ERR, "%s: count not parse 1 value from '%s'\n", __func__,
levelbuf);
- return -RIG_EPROTO;
+ RETURNFUNC( -RIG_EPROTO);
}
}
else
@@ -2356,14 +2355,14 @@ static int kenwood_get_power_minmax(RIG *rig, int *power_now, int *power_min,
{
rig_debug(RIG_DEBUG_ERR, "%s: count not parse 3 values from '%s'\n", __func__,
levelbuf);
- return -RIG_EPROTO;
+ RETURNFUNC( -RIG_EPROTO);
}
if (restore) // only need to restore if 3-value cmd is done
{
snprintf(levelbuf, sizeof(levelbuf), "PC%03d;", *power_now);
retval = kenwood_transaction(rig, levelbuf, NULL, 0);
- return retval;
+ RETURNFUNC( retval);
}
}
@@ -2373,7 +2372,7 @@ static int kenwood_get_power_minmax(RIG *rig, int *power_now, int *power_min,
rig->state.power_now = *power_now;
rig->state.power_min = *power_min;
rig->state.power_max = *power_max;
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
}
int kenwood_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
@@ -2403,7 +2402,7 @@ int kenwood_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
// Power min/max can vary so we query to find them out every time
retval = kenwood_get_power_minmax(rig, &power_now, &power_min, &power_max, 0);
- if (retval != RIG_OK) { return retval; }
+ if (retval != RIG_OK) { RETURNFUNC( retval; )}
// https://github.com/Hamlib/Hamlib/issues/465
kenwood_val = val.f * power_max;
@@ -2456,10 +2455,10 @@ int kenwood_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
retval = kenwood_get_micgain_minmax(rig, &micgain_now, &priv->micgain_min,
&priv->micgain_max, 0);
- if (retval != RIG_OK) { return retval; }
+ if (retval != RIG_OK) { RETURNFUNC( retval; )}
}
- if (val.f > 1.0 || val.f < 0) { return -RIG_EINVAL; }
+ if (val.f > 1.0 || val.f < 0) { RETURNFUNC( -RIG_EINVAL; )}
// is micgain_min ever > 0 ??
kenwood_val = val.f * (priv->micgain_max - priv->micgain_min) +
@@ -2472,7 +2471,7 @@ int kenwood_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
/* XXX check level range */
// KX2 and KX3 have range -190 to 250
- if (val.f > 1.0 || val.f < 0) { return -RIG_EINVAL; }
+ if (val.f > 1.0 || val.f < 0) { RETURNFUNC( -RIG_EINVAL; )}
kenwood_val = val.f * 255.0;
snprintf(levelbuf, sizeof(levelbuf), "RG%03d", kenwood_val);
@@ -2515,7 +2514,7 @@ int kenwood_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
if (!foundit)
{
- return -RIG_EINVAL;
+ RETURNFUNC( -RIG_EINVAL);
}
}
@@ -2544,7 +2543,7 @@ int kenwood_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
if (!foundit)
{
- return -RIG_EINVAL;
+ RETURNFUNC( -RIG_EINVAL);
}
}
@@ -2553,7 +2552,7 @@ int kenwood_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
case RIG_LEVEL_SLOPE_HIGH:
if (val.i > 20 || val.i < 0)
{
- return -RIG_EINVAL;
+ RETURNFUNC( -RIG_EINVAL);
}
snprintf(levelbuf, sizeof(levelbuf), "SH%02d", (val.i));
@@ -2562,7 +2561,7 @@ int kenwood_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
case RIG_LEVEL_SLOPE_LOW:
if (val.i > 20 || val.i < 0)
{
- return -RIG_EINVAL;
+ RETURNFUNC( -RIG_EINVAL);
}
snprintf(levelbuf, sizeof(levelbuf), "SL%02d", (val.i));
@@ -2571,7 +2570,7 @@ int kenwood_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
case RIG_LEVEL_CWPITCH:
if (val.i > 1000 || val.i < 400)
{
- return -RIG_EINVAL;
+ RETURNFUNC( -RIG_EINVAL);
}
snprintf(levelbuf, sizeof(levelbuf), "PT%02d", (val.i / 50) - 8);
@@ -2580,7 +2579,7 @@ int kenwood_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
case RIG_LEVEL_KEYSPD:
if (val.i > 50 || val.i < 5)
{
- return -RIG_EINVAL;
+ RETURNFUNC( -RIG_EINVAL);
}
snprintf(levelbuf, sizeof(levelbuf), "KS%03d", val.i);
@@ -2589,10 +2588,10 @@ int kenwood_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported set_level %s", __func__,
rig_strlevel(level));
- return -RIG_EINVAL;
+ RETURNFUNC( -RIG_EINVAL);
}
- return kenwood_transaction(rig, levelbuf, NULL, 0);
+ RETURNFUNC( kenwood_transaction(rig, levelbuf, NULL, 0));
}
int get_kenwood_level(RIG *rig, const char *cmd, float *fval, int *ival)
@@ -2606,14 +2605,14 @@ int get_kenwood_level(RIG *rig, const char *cmd, float *fval, int *ival)
if (!fval && !ival)
{
- return -RIG_EINVAL;
+ RETURNFUNC( -RIG_EINVAL);
}
retval = kenwood_safe_transaction(rig, cmd, lvlbuf, 10, len + 3);
if (retval != RIG_OK)
{
- return retval;
+ RETURNFUNC( retval);
}
/* 000..255 */
@@ -2623,7 +2622,7 @@ int get_kenwood_level(RIG *rig, const char *cmd, float *fval, int *ival)
if (fval) { *fval = lvl / 255.0; } // our default scaling of 0-255
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
};
@@ -2643,7 +2642,7 @@ int kenwood_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
if (!val)
{
- return -RIG_EINVAL;
+ RETURNFUNC( -RIG_EINVAL);
}
switch (level)
@@ -2666,7 +2665,7 @@ int kenwood_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
if (retval != RIG_OK)
{
- return retval;
+ RETURNFUNC( retval);
}
/* XXX atoi ? */
@@ -2689,7 +2688,7 @@ int kenwood_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
if (retval != RIG_OK)
{
- return retval;
+ RETURNFUNC( retval);
}
sscanf(lvlbuf + len, "%d", &val->i); /* rawstr */
@@ -2710,7 +2709,7 @@ int kenwood_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
if (retval != RIG_OK)
{
- return retval;
+ RETURNFUNC( retval);
}
sscanf(lvlbuf + 2, "%d", &lvl);
@@ -2728,13 +2727,13 @@ int kenwood_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
rig_debug(RIG_DEBUG_ERR, "%s: "
"unexpected att level %d\n",
__func__, lvl);
- return -RIG_EPROTO;
+ RETURNFUNC( -RIG_EPROTO);
}
}
if (i != lvl)
{
- return -RIG_EINTERNAL;
+ RETURNFUNC( -RIG_EINTERNAL);
}
val->i = rig->state.attenuator[i - 1];
@@ -2747,7 +2746,7 @@ int kenwood_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
if (retval != RIG_OK)
{
- return retval;
+ RETURNFUNC( retval);
}
if (lvlbuf[2] == '0')
@@ -2765,13 +2764,13 @@ int kenwood_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
rig_debug(RIG_DEBUG_ERR, "%s: "
"unexpected preamp level %d\n",
__func__, lvl);
- return -RIG_EPROTO;
+ RETURNFUNC( -RIG_EPROTO);
}
}
if (i != lvl)
{
- return -RIG_EINTERNAL;
+ RETURNFUNC( -RIG_EINTERNAL);
}
val->i = rig->state.preamp[i - 1];
@@ -2781,7 +2780,7 @@ int kenwood_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
rig_debug(RIG_DEBUG_ERR, "%s: "
"unexpected preamp char '%c'\n",
__func__, lvlbuf[2]);
- return -RIG_EPROTO;
+ RETURNFUNC( -RIG_EPROTO);
}
break;
@@ -2790,10 +2789,10 @@ int kenwood_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
// Power min/max can vary so we query to find them out every time
retval = kenwood_get_power_minmax(rig, &power_now, &power_min, &power_max, 1);
- if (retval != RIG_OK) { return retval; }
+ if (retval != RIG_OK) { RETURNFUNC( retval; )}
val->f = (power_now - power_min) / (float)(power_max - power_min);
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
case RIG_LEVEL_AF:
@@ -2846,40 +2845,38 @@ int kenwood_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
{
priv->ag_format = -1; // we'll keep trying next time
rig_debug(RIG_DEBUG_WARN, "%s: Unable to set AG format?\n", __func__);
- return RIG_OK; // this is non-fatal for now
+ RETURNFUNC( RIG_OK;) // this is non-fatal for no))w
}
switch (priv->ag_format)
{
case 0:
priv->ag_format = -1; // reset to try again
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
break;
case 1:
- return get_kenwood_level(rig, "AG", &val->f, NULL);
+ RETURNFUNC( get_kenwood_level(rig, "AG", &val->f, NULL));
break;
case 2:
- return get_kenwood_level(rig, "AG0", &val->f, NULL);
+ RETURNFUNC( get_kenwood_level(rig, "AG0", &val->f, NULL));
break;
case 3:
- return get_kenwood_level(rig, vfo == RIG_VFO_MAIN ? "AG0" : "AG1", &val->f,
- NULL);
+ RETURNFUNC( get_kenwood_level(rig, vfo == RIG_VFO_MAIN ? "AG0" : "AG1", &val->f, NULL));
break;
default:
rig_debug(RIG_DEBUG_WARN, "%s: Invalid ag_format=%d?\n", __func__,
priv->ag_format);
- return -RIG_EPROTO;
+ RETURNFUNC( -RIG_EPROTO);
}
case RIG_LEVEL_RF:
- return get_kenwood_level(rig, "RG", &val->f, NULL);
+ RETURNFUNC( get_kenwood_level(rig, "RG", &val->f, NULL));
+
- case RIG_LEVEL_SQL:
- return get_kenwood_level(rig, "SQ", &val->f, NULL);
case RIG_LEVEL_MICGAIN:
{
@@ -2890,7 +2887,7 @@ int kenwood_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
retval = kenwood_get_micgain_minmax(rig, &micgain_now, &priv->micgain_min,
&priv->micgain_max, 1);
- if (retval != RIG_OK) { return retval; }
+ if (retval != RIG_OK) { RETURNFUNC( retval; )}
}
rig_debug(RIG_DEBUG_TRACE, "%s: micgain_min=%d, micgain_max=%d\n", __func__,
@@ -2901,12 +2898,12 @@ int kenwood_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
if (ret != RIG_OK)
{
rig_debug(RIG_DEBUG_ERR, "%s: Error getting MICGAIN\n", __func__);
- return ret;
+ RETURNFUNC( ret);
}
val->f = (val->i - priv->micgain_min) / (float)(priv->micgain_max -
priv->micgain_min);
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
}
case RIG_LEVEL_AGC:
@@ -2918,14 +2915,14 @@ int kenwood_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
else if (agclevel < 170) { val->i = 2; }
else if (agclevel <= 255) { val->i = 3; }
- return ret;
+ RETURNFUNC( ret);
case RIG_LEVEL_SLOPE_LOW:
retval = kenwood_transaction(rig, "SL", lvlbuf, sizeof(lvlbuf));
if (retval != RIG_OK)
{
- return retval;
+ RETURNFUNC( retval);
}
val->i = atoi(&lvlbuf[2]);
@@ -2936,7 +2933,7 @@ int kenwood_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
if (retval != RIG_OK)
{
- return retval;
+ RETURNFUNC( retval);
}
val->i = atoi(&lvlbuf[2]);
@@ -2947,7 +2944,7 @@ int kenwood_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
if (retval != RIG_OK)
{
- return retval;
+ RETURNFUNC( retval);
}
sscanf(lvlbuf + 2, "%d", &val->i);
@@ -2959,7 +2956,7 @@ int kenwood_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
if (retval != RIG_OK)
{
- return retval;
+ RETURNFUNC( retval);
}
sscanf(lvlbuf + 2, "%d", &val->i);
@@ -2974,15 +2971,15 @@ int kenwood_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_COMP:
case RIG_LEVEL_BKINDL:
case RIG_LEVEL_BALANCE:
- return -RIG_ENIMPL;
+ RETURNFUNC( -RIG_ENIMPL);
default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported get_level %s", __func__,
rig_strlevel(level));
- return -RIG_EINVAL;
+ RETURNFUNC( -RIG_EINVAL);
}
- return RIG_OK;
+ RETURNFUNC( RIG_OK);
}
int kenwood_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
@@ -3011,7 +3008,7 @@ int kenwood_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
default:
rig_debug(RIG_DEBUG_ERR, "%s: expected 0,1, or 2 and got %d\n", __func__,
status);
- return -RIG_EINVAL;
+ RETURNFUNC( -RIG_EINVAL);
}
}
else
@@ -3019,11 +3016,11 @@ int kenwood_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
snprintf(buf, sizeof(buf), "NB%c", (status == 0) ? '0' : '1');
}
- return kenwood_transaction(rig, buf, NULL, 0);
+ RETURNFUNC( kenwood_transaction(rig, buf, NULL, 0));
case RIG_FUNC_ABM:
snprintf(buf, sizeof(buf), "AM%c", (status == 0) ? '0' : '1');
- return kenwood_transaction(rig, buf, NULL, 0);
+ RETURNFUNC( kenwood_transaction(rig, buf, NULL, 0));
case RIG_FUNC_COMP:
if (RIG_IS_TS890S)
@@ -3035,23 +3032,23 @@ int kenwood_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
snprintf(buf, sizeof(buf), "PR%c", (status == 0) ? '0' : '1');
}
- return kenwood_transaction(rig, buf, NULL, 0);
+ RETURNFUNC( kenwood_transaction(rig, buf, NULL, 0));
case RIG_FUNC_TONE:
snprintf(buf, sizeof(buf), "TO%c", (status == 0) ? '0' : '1');
- return kenwood_transaction(rig, buf, NULL, 0);
+ RETURNFUNC( kenwood_transaction(rig, buf, NULL, 0));
case RIG_FUNC_TSQL:
snprintf(buf, sizeof(buf), "CT%c", (status == 0) ? '0' : '1');
- return kenwood_transaction(rig, buf, NULL, 0);
+ RETURNFUNC( kenwood_transaction(rig, buf, NULL, 0));
case RIG_FUNC_VOX:
snprintf(buf, sizeof(buf), "VX%c", (status == 0) ? '0' : '1');
- return kenwood_transaction(rig, buf, NULL, 0);
+ RETURNFUNC( kenwood_transaction(rig, buf, NULL, 0));
case RIG_FUNC_FAGC:
snprintf(buf, sizeof(buf), "GT00%c", (status == 0) ? '4' : '2');
- return kenwood_transaction(rig, buf, NULL, 0);
+ RETURNFUNC( kenwood_transaction(rig, buf, NULL, 0));
case RIG_FUNC_NR:
if (RIG_IS_TS890S)
@@ -3067,42 +3064,42 @@ int kenwood_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
snprintf(buf, sizeof(buf), "NR%c", (status == 0) ? '0' : '1');
}
- return kenwood_transaction(rig, buf, NULL, 0);
+ RETURNFUNC( kenwood_transaction(rig, buf, NULL, 0));
case RIG_FUNC_BC:
snprintf(buf, sizeof(buf), "BC%c", (status == 0) ? '0' : '1');
- return kenwood_transaction(rig, buf, NULL, 0);
+ RETURNFUNC( kenwood_transaction(rig, buf, NULL, 0));
case RIG_FUNC_BC2:
snprintf(buf, sizeof(buf), "BC%c", (status == 0) ? '0' : '2');
- return kenwood_transaction(rig, buf, NULL, 0);
+ RETURNFUNC( kenwood_transaction(rig, buf, NULL, 0));
case RIG_FUNC_ANF:
snprintf(buf, sizeof(buf), "NT%c", (status == 0) ? '0' : '1');
- return kenwood_transaction(rig, buf, NULL, 0);
+ RETURNFUNC( kenwood_transaction(rig, buf, NULL, 0));
case RIG_FUNC_LOCK:
snprintf(buf, sizeof(buf), "LK%c", (status == 0) ? '0' : '1');
- return kenwood_transaction(rig, buf, NULL, 0);
+ RETURNFUNC( kenwood_transaction(rig, buf, NULL, 0));
case RIG_FUNC_AIP:
snprintf(buf, sizeof(buf), "MX%c", (statu...
[truncated message content] |
