diff --git a/rigs/kenwood/flex6xxx.c b/rigs/kenwood/flex6xxx.c index 23042a812..1be7c3269 100644 --- a/rigs/kenwood/flex6xxx.c +++ b/rigs/kenwood/flex6xxx.c @@ -1294,7 +1294,7 @@ int powersdr_get_parm(RIG *rig, setting_t parm, value_t *val) if (n != 1) { rig_debug(RIG_DEBUG_ERR, "%s: unknown band=%s\n", __func__, buf); - return (-RIG_EPROTO); + RETURNFUNC(-RIG_EPROTO); } switch (band) diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c index 4c6069c26..d88a2000a 100644 --- a/rigs/kenwood/kenwood.c +++ b/rigs/kenwood/kenwood.c @@ -536,7 +536,7 @@ transaction_read: { rig_debug(RIG_DEBUG_ERR, "%s: Command rejected by the rig (get): '%s'\n", __func__, cmdstr); - RETURNFUNC(-RIG_ERJCTED); + RETURNFUNC2(-RIG_ERJCTED); } /* Command not understood by rig or rig busy */ @@ -1242,7 +1242,7 @@ int kenwood_set_vfo(RIG *rig, vfo_t vfo) if (vfo == RIG_VFO_B && priv->is_emulation && priv->curr_mode > 0) { HAMLIB_TRACE; - RETURNFUNC2(RIG_OK); + RETURNFUNC(RIG_OK); } #if 0 @@ -1251,7 +1251,7 @@ int kenwood_set_vfo(RIG *rig, vfo_t vfo) { rig_debug(RIG_DEBUG_VERBOSE, "%s: vfo already is %s...skipping\n", __func__, rig_strvfo(vfo)); - RETURNFUNC2(RIG_OK); + RETURNFUNC(RIG_OK); } #endif @@ -1284,11 +1284,11 @@ int kenwood_set_vfo(RIG *rig, vfo_t vfo) case RIG_VFO_CURR: HAMLIB_TRACE; STATE(rig)->current_vfo = RIG_VFO_CURR; - RETURNFUNC2(RIG_OK); + RETURNFUNC(RIG_OK); default: rig_debug(RIG_DEBUG_ERR, "%s: unsupported VFO %s\n", __func__, rig_strvfo(vfo)); - RETURNFUNC2(-RIG_EINVAL); + RETURNFUNC(-RIG_EINVAL); } //if rig=ts2000 then check Satellite mode status @@ -1302,7 +1302,7 @@ int kenwood_set_vfo(RIG *rig, vfo_t vfo) if (retval != RIG_OK) { - RETURNFUNC2(retval); + RETURNFUNC(retval); } rig_debug(RIG_DEBUG_VERBOSE, "%s: satellite mode status %s\n", __func__, @@ -1313,7 +1313,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 - RETURNFUNC2(RIG_OK); + RETURNFUNC(RIG_OK); } } @@ -1344,7 +1344,7 @@ int kenwood_set_vfo(RIG *rig, vfo_t vfo) if (retval != RIG_OK) { - RETURNFUNC2(retval); + RETURNFUNC(retval); } HAMLIB_TRACE; @@ -1354,7 +1354,7 @@ int kenwood_set_vfo(RIG *rig, vfo_t vfo) /* If split mode on, the don't change TxVFO */ if ('N' == cmdbuf[1] || priv->split != RIG_SPLIT_OFF) { - RETURNFUNC2(RIG_OK); + RETURNFUNC(RIG_OK); } HAMLIB_TRACE; @@ -1406,7 +1406,7 @@ int kenwood_set_vfo(RIG *rig, vfo_t vfo) cmdbuf[1] = 'T'; RETURNFUNC(kenwood_transaction(rig, cmdbuf, NULL, 0)); #else - RETURNFUNC2(retval); + RETURNFUNC(retval); #endif } @@ -2262,7 +2262,7 @@ int kenwood_set_xit(RIG *rig, vfo_t vfo, shortfreq_t rit) int kenwood_scan(RIG *rig, vfo_t vfo, scan_t scan, int ch) { - rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__); + ENTERFUNC; if (RIG_IS_TS990S) { @@ -2751,7 +2751,7 @@ static int kenwood_get_filter_width(RIG *rig, rmode_t mode, pbwidth_t *width) if (filter_value >= 50) // then it's probably a custom filter width { *width = filter_value; - return (RIG_OK); + RETURNFUNC(RIG_OK); } RETURNFUNC(-RIG_EINVAL); @@ -3788,23 +3788,23 @@ int kenwood_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) if (retval != RIG_OK) { - return retval; + RETURNFUNC(retval); } ack_len = strlen(lvlbuf); if (ack_len != len) { - return -RIG_EPROTO; + RETURNFUNC(-RIG_EPROTO); } if (sscanf(&lvlbuf[len - 3], "%d", &lvl) != 1) { - return -RIG_EPROTO; + RETURNFUNC(-RIG_EPROTO); } val->f = (float) lvl / 255.f; - return RIG_OK; + RETURNFUNC(RIG_OK); } case RIG_LEVEL_ATT: @@ -5547,7 +5547,7 @@ int kenwood_send_voice_mem(RIG *rig, vfo_t vfo, int bank) || rig->caps->rig_model == RIG_MODEL_TS480)) { rig_debug(RIG_DEBUG_ERR, "%s: TS2000/TS480 channel is from 1 to 3\n", __func__); - return -RIG_EINVAL; + RETURNFUNC(-RIG_EINVAL); } // some rigs have 5 channels -- newew ones have 10 channels @@ -5556,7 +5556,7 @@ int kenwood_send_voice_mem(RIG *rig, vfo_t vfo, int bank) || rig->caps->rig_model == RIG_MODEL_TS590S)) { rig_debug(RIG_DEBUG_ERR, "%s: TS590S/SG channel is from 1 to 5\n", __func__); - return -RIG_EINVAL; + RETURNFUNC(-RIG_EINVAL); } if (rig->caps->rig_model == RIG_MODEL_TS2000 @@ -6070,7 +6070,7 @@ const char *kenwood_get_info(RIG *rig) char firmbuf[10]; int retval; - ENTERFUNC; + ENTERFUNC2; if (!rig) { diff --git a/rigs/kenwood/ts2000.c b/rigs/kenwood/ts2000.c index 477b541c7..feed1ecf1 100644 --- a/rigs/kenwood/ts2000.c +++ b/rigs/kenwood/ts2000.c @@ -272,7 +272,7 @@ int ts2000_init(RIG *rig) if (retval != RIG_OK) { - return retval; + RETURNFUNC(retval); } priv = (struct kenwood_priv_data *) STATE(rig)->priv; @@ -328,12 +328,12 @@ static int ts2000_set_func(RIG *rig, vfo_t vfo, setting_t func, int status) { case RIG_FUNC_MON: SNPRINTF(buf, sizeof(buf), "ML00%c", (status == 0) ? '0' : '1'); - RETURNFUNC(kenwood_transaction(rig, buf, NULL, 0)); + RETURNFUNC2(kenwood_transaction(rig, buf, NULL, 0)); case RIG_FUNC_LOCK: SNPRINTF(buf, sizeof(buf), "LK%c%c", (status == 0) ? '0' : '1', (status == 0) ? '0' : '1'); - RETURNFUNC(kenwood_transaction(rig, buf, NULL, 0)); + RETURNFUNC2(kenwood_transaction(rig, buf, NULL, 0)); default: return kenwood_set_func(rig, vfo, func, status); @@ -377,7 +377,7 @@ static int ts2000_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status) break; default: - return kenwood_get_func(rig, vfo, func, status); + RETURNFUNC(kenwood_get_func(rig, vfo, func, status)); } RETURNFUNC(RIG_OK); @@ -462,7 +462,7 @@ static int ts2000_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) case RIG_LEVEL_PREAMP: if (val.i != 12 && val.i != 0) { - RETURNFUNC(-RIG_EINVAL); + RETURNFUNC2(-RIG_EINVAL); } SNPRINTF(levelbuf, sizeof(levelbuf), "PA%c", (val.i == 12) ? '1' : '0'); @@ -471,7 +471,7 @@ static int ts2000_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) case RIG_LEVEL_ATT: if (val.i != 12 && val.i != 0) { - RETURNFUNC(-RIG_EINVAL); + RETURNFUNC2(-RIG_EINVAL); } SNPRINTF(levelbuf, sizeof(levelbuf), "RA%02d", (val.i == 12) ? 1 : 0); @@ -493,7 +493,7 @@ static int ts2000_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) break; default: - RETURNFUNC(-RIG_EINVAL); + RETURNFUNC2(-RIG_EINVAL); } SNPRINTF(levelbuf, sizeof(levelbuf), "RM%d", kenwood_val); @@ -502,10 +502,10 @@ static int ts2000_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) case RIG_LEVEL_CWPITCH: if (val.i > 1000 || val.i < 400) { - RETURNFUNC(-RIG_EINVAL); + RETURNFUNC2(-RIG_EINVAL); } - RETURNFUNC(ts2000_set_ex_menu(rig, 31, 2, (val.i - 400) / 50)); + RETURNFUNC2(ts2000_set_ex_menu(rig, 31, 2, (val.i - 400) / 50)); default: return kenwood_set_level(rig, vfo, level, val); @@ -597,26 +597,26 @@ static int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) switch (level) { case RIG_LEVEL_AF: - return kenwood_get_level(rig, vfo, level, val); + RETURNFUNC(kenwood_get_level(rig, vfo, level, val)); case RIG_LEVEL_RF: retval = kenwood_transaction(rig, "RG", ackbuf, sizeof(ackbuf)); if (RIG_OK != retval) { - return retval; + RETURNFUNC(retval); } ack_len = strlen(ackbuf); if (5 != ack_len) { - return -RIG_EPROTO; + RETURNFUNC(-RIG_EPROTO); } if (1 != sscanf(&ackbuf[2], "%d", &levelint)) { - return -RIG_EPROTO; + RETURNFUNC(-RIG_EPROTO); } val->f = levelint / (float) 255; @@ -629,23 +629,23 @@ static int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) if (retval != RIG_OK) { - return retval; + RETURNFUNC(retval); } ack_len = strlen(ackbuf); if (ack_len != ack_len_expected) { - return -RIG_EPROTO; + RETURNFUNC(-RIG_EPROTO); } if (sscanf(&ackbuf[ack_len_expected - 3], "%d", &levelint) != 1) { - return -RIG_EPROTO; + RETURNFUNC(-RIG_EPROTO); } val->f = (float) levelint / 255.f; - return RIG_OK; + RETURNFUNC(RIG_OK); case RIG_LEVEL_AGC: retval = kenwood_transaction(rig, "GT", ackbuf, sizeof(ackbuf)); @@ -653,19 +653,19 @@ static int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) if (RIG_OK != retval) { - return retval; + RETURNFUNC(retval); } ack_len = strlen(ackbuf); if (ack_len != ack_len_expected) { - return -RIG_EPROTO; + RETURNFUNC(-RIG_EPROTO); } if (1 != sscanf(&ackbuf[ack_len_expected - 3], "%d", &levelint)) { - return -RIG_EPROTO; + RETURNFUNC(-RIG_EPROTO); } if (levelint == 0) @@ -689,7 +689,7 @@ static int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) val->i = RIG_AGC_SLOW; } - return RIG_OK; + RETURNFUNC(RIG_OK); case RIG_LEVEL_STRENGTH: if (CACHE(rig)->ptt != RIG_PTT_OFF) @@ -698,7 +698,7 @@ static int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) break; } - return kenwood_get_level(rig, vfo, level, val); + RETURNFUNC(kenwood_get_level(rig, vfo, level, val)); case RIG_LEVEL_MONITOR_GAIN: { @@ -868,7 +868,7 @@ static int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) break; default: - return -RIG_ENAVAIL; + RETURNFUNC(-RIG_ENAVAIL); } break; @@ -923,7 +923,7 @@ static int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) } default: - return kenwood_get_level(rig, vfo, level, val); + RETURNFUNC(kenwood_get_level(rig, vfo, level, val)); } RETURNFUNC(RIG_OK); diff --git a/rigs/kenwood/ts480.c b/rigs/kenwood/ts480.c index eb194d1ac..0ecefc1af 100644 --- a/rigs/kenwood/ts480.c +++ b/rigs/kenwood/ts480.c @@ -247,12 +247,12 @@ static int ts480_set_func(RIG *rig, vfo_t vfo, setting_t func, int status) { case RIG_FUNC_MON: SNPRINTF(buf, sizeof(buf), "ML00%c", (status == 0) ? '0' : '1'); - RETURNFUNC(kenwood_transaction(rig, buf, NULL, 0)); + RETURNFUNC2(kenwood_transaction(rig, buf, NULL, 0)); case RIG_FUNC_LOCK: SNPRINTF(buf, sizeof(buf), "LK%c%c", (status == 0) ? '0' : '1', (status == 0) ? '0' : '1'); - RETURNFUNC(kenwood_transaction(rig, buf, NULL, 0)); + RETURNFUNC2(kenwood_transaction(rig, buf, NULL, 0)); default: return kenwood_set_func(rig, vfo, func, status); @@ -296,7 +296,7 @@ static int ts480_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status) break; default: - return kenwood_get_func(rig, vfo, func, status); + RETURNFUNC(kenwood_get_func(rig, vfo, func, status)); } RETURNFUNC(RIG_OK); @@ -373,7 +373,7 @@ int kenwood_ts480_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) case RIG_LEVEL_PREAMP: if (val.i != 12 && val.i != 0) { - RETURNFUNC(-RIG_EINVAL); + RETURNFUNC2(-RIG_EINVAL); } SNPRINTF(levelbuf, sizeof(levelbuf), "PA%c", (val.i == 12) ? '1' : '0'); @@ -382,7 +382,7 @@ int kenwood_ts480_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) case RIG_LEVEL_ATT: if (val.i != 12 && val.i != 0) { - RETURNFUNC(-RIG_EINVAL); + RETURNFUNC2(-RIG_EINVAL); } SNPRINTF(levelbuf, sizeof(levelbuf), "RA%02d", (val.i == 12) ? 1 : 0); @@ -404,7 +404,7 @@ int kenwood_ts480_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) break; default: - RETURNFUNC(-RIG_EINVAL); + RETURNFUNC2(-RIG_EINVAL); } SNPRINTF(levelbuf, sizeof(levelbuf), "RM%d", kenwood_val); @@ -413,10 +413,10 @@ int kenwood_ts480_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) case RIG_LEVEL_CWPITCH: if (val.i > 1000 || val.i < 400) { - RETURNFUNC(-RIG_EINVAL); + RETURNFUNC2(-RIG_EINVAL); } - RETURNFUNC(ts480_set_ex_menu(rig, 34, 2, (val.i - 400) / 50)); + RETURNFUNC2(ts480_set_ex_menu(rig, 34, 2, (val.i - 400) / 50)); default: return kenwood_set_level(rig, vfo, level, val); @@ -495,30 +495,30 @@ kenwood_ts480_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) switch (level) { case RIG_LEVEL_AF: - return kenwood_get_level(rig, vfo, level, val); + RETURNFUNC(kenwood_get_level(rig, vfo, level, val)); case RIG_LEVEL_RF: retval = kenwood_transaction(rig, "RG", ackbuf, sizeof(ackbuf)); if (RIG_OK != retval) { - return retval; + RETURNFUNC(retval); } ack_len = strlen(ackbuf); if (5 != ack_len) { - return -RIG_EPROTO; + RETURNFUNC(-RIG_EPROTO); } if (1 != sscanf(&ackbuf[2], "%d", &levelint)) { - return -RIG_EPROTO; + RETURNFUNC(-RIG_EPROTO); } val->f = levelint / (float) 100; - return RIG_OK; + RETURNFUNC(RIG_OK); case RIG_LEVEL_SQL: retval = kenwood_transaction(rig, "SQ0", ackbuf, sizeof(ackbuf)); @@ -526,23 +526,23 @@ kenwood_ts480_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) if (RIG_OK != retval) { - return retval; + RETURNFUNC(retval); } ack_len = strlen(ackbuf); if (ack_len != ack_len_expected) { - return -RIG_EPROTO; + RETURNFUNC(-RIG_EPROTO); } if (1 != sscanf(&ackbuf[ack_len_expected - 3], "%d", &levelint)) { - return -RIG_EPROTO; + RETURNFUNC(-RIG_EPROTO); } val->f = (float) levelint / 255.; - return RIG_OK; + RETURNFUNC(RIG_OK); case RIG_LEVEL_AGC: retval = kenwood_transaction(rig, "GT", ackbuf, sizeof(ackbuf)); @@ -550,14 +550,14 @@ kenwood_ts480_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) if (RIG_OK != retval) { - return retval; + RETURNFUNC(retval); } ack_len = strlen(ackbuf); if (ack_len != ack_len_expected) { - return -RIG_EPROTO; + RETURNFUNC(-RIG_EPROTO); } switch (ackbuf[ack_len_expected - 1]) @@ -575,10 +575,10 @@ kenwood_ts480_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) break; default: - return -RIG_EPROTO; + RETURNFUNC(-RIG_EPROTO); } - return RIG_OK; + RETURNFUNC(RIG_OK); case RIG_LEVEL_STRENGTH: if (CACHE(rig)->ptt != RIG_PTT_OFF) @@ -587,7 +587,7 @@ kenwood_ts480_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) break; } - return kenwood_get_level(rig, vfo, level, val); + RETURNFUNC(kenwood_get_level(rig, vfo, level, val)); case RIG_LEVEL_MONITOR_GAIN: { @@ -698,7 +698,7 @@ kenwood_ts480_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) break; default: - return -RIG_ENAVAIL; + RETURNFUNC(-RIG_ENAVAIL); } break; @@ -1204,7 +1204,7 @@ int ts480_init(RIG *rig) if (retval != RIG_OK) { - return retval; + RETURNFUNC(retval); } priv = (struct kenwood_priv_data *) STATE(rig)->priv; @@ -2223,7 +2223,7 @@ int malachite_set_freq(RIG *rig, vfo_t vfo, freq_t freq) retval = kenwood_set_freq(rig, vfo, freq); - RETURNFUNC2(retval); + RETURNFUNC(retval); } /* diff --git a/rigs/kenwood/ts590.c b/rigs/kenwood/ts590.c index 22e7a5fe7..b647f9554 100644 --- a/rigs/kenwood/ts590.c +++ b/rigs/kenwood/ts590.c @@ -533,7 +533,7 @@ static int ts590_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status) RETURNFUNC(RIG_OK); default: - return kenwood_get_func(rig, vfo, func, status); + RETURNFUNC(kenwood_get_func(rig, vfo, func, status)); } RETURNFUNC(RIG_OK); @@ -776,7 +776,7 @@ static int ts590_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) val->f = roundl(levelint * 10 / 10.0) / 10.0; } - return retval; + RETURNFUNC(retval); case RIG_LEVEL_AF: RETURNFUNC(kenwood_get_level(rig, vfo, level, val));