From aa94298a098535a841ded77cd22899ad40e5cb6b Mon Sep 17 00:00:00 2001 From: George Baltz N3GB Date: Thu, 6 Jun 2024 19:04:21 -0400 Subject: [PATCH] Convert rigs/icom/icom.[ch] sed -i plus manual tuning in icom.c --- rigs/icom/icom.c | 279 ++++++++++++++++++++++++----------------------- rigs/icom/icom.h | 164 ++++++++++++++-------------- 2 files changed, 222 insertions(+), 221 deletions(-) diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c index 7dd23c42e..5ee784e0c 100644 --- a/rigs/icom/icom.c +++ b/rigs/icom/icom.c @@ -650,6 +650,7 @@ int icom_init(RIG *rig) struct icom_priv_data *priv; struct icom_priv_caps *priv_caps; struct rig_caps *caps; + struct rig_state *rs = STATE(rig); int i; ENTERFUNC; @@ -669,16 +670,16 @@ int icom_init(RIG *rig) priv_caps = (struct icom_priv_caps *) caps->priv; - rig->state.priv = (struct icom_priv_data *) calloc(1, + rs->priv = (struct icom_priv_data *) calloc(1, sizeof(struct icom_priv_data)); - if (!rig->state.priv) + if (!rs->priv) { /* whoops! memory shortage! */ RETURNFUNC(-RIG_ENOMEM); } - priv = rig->state.priv; + priv = rs->priv; priv->spectrum_scope_count = 0; @@ -738,7 +739,7 @@ int icom_cleanup(RIG *rig) ENTERFUNC; - priv = rig->state.priv; + priv = STATE(rig)->priv; for (i = 0; rig->caps->spectrum_scopes[i].name != NULL; i++) { @@ -749,12 +750,12 @@ int icom_cleanup(RIG *rig) } } - if (rig->state.priv) + if (STATE(rig)->priv) { - free(rig->state.priv); + free(STATE(rig)->priv); } - rig->state.priv = NULL; + STATE(rig)->priv = NULL; RETURNFUNC(RIG_OK); } @@ -769,7 +770,7 @@ int icom_get_usb_echo_off(RIG *rig) int retval; unsigned char ackbuf[MAXFRAMELEN]; int ack_len = sizeof(ackbuf); - struct rig_state *rs = &rig->state; + struct rig_state *rs = STATE(rig); struct icom_priv_data *priv = (struct icom_priv_data *) rs->priv; ENTERFUNC; @@ -833,7 +834,7 @@ static int icom_current_vfo_x25(RIG *rig, vfo_t *vfo) freq_t freq_current, freq_other, freq_current_2; vfo_t vfo_current = RIG_VFO_NONE; vfo_t vfo_check = RIG_VFO_A; - struct rig_state *rs = &rig->state; + struct rig_state *rs = STATE(rig); struct icom_priv_data *priv = rs->priv; const struct icom_priv_caps *priv_caps = rig->caps->priv; @@ -853,8 +854,8 @@ static int icom_current_vfo_x25(RIG *rig, vfo_t *vfo) // so we only check vfo once when freqs are equal rig_debug(RIG_DEBUG_TRACE, "%s: VFO already determined, returning current_vfo %s\n", - __func__, rig_strvfo(rig->state.current_vfo)); - *vfo = rig->state.current_vfo; + __func__, rig_strvfo(rs->current_vfo)); + *vfo = rs->current_vfo; return RIG_OK; } @@ -864,7 +865,7 @@ static int icom_current_vfo_x25(RIG *rig, vfo_t *vfo) rig_set_freq(rig, RIG_VFO_CURR, freq_current + freq_offset); } - if (rig->state.current_vfo == RIG_VFO_B) { vfo_check = RIG_VFO_B; } + if (rs->current_vfo == RIG_VFO_B) { vfo_check = RIG_VFO_B; } rig_set_vfo(rig, vfo_check); rig_get_freq(rig, RIG_VFO_CURR, &freq_current_2); @@ -1078,11 +1079,11 @@ static void icom_satmode_fix(RIG *rig, int satmode) // Modify the copy of targetable_vfo in rig_state only! if (satmode) { - rig->state.targetable_vfo = 0; + STATE(rig)->targetable_vfo = 0; } else { - rig->state.targetable_vfo = rig->caps->targetable_vfo; + STATE(rig)->targetable_vfo = rig->caps->targetable_vfo; } } } @@ -1151,7 +1152,7 @@ retry_open: rig_debug(RIG_DEBUG_TRACE, "%s: echo status known, getting frequency\n", __func__); rp->retry = 0; - rig->state.current_vfo = icom_current_vfo(rig); + rs->current_vfo = icom_current_vfo(rig); // some rigs like the IC7100 still echo when in standby // so asking for freq now should timeout if such a rig freq_t tfreq; @@ -1245,7 +1246,7 @@ retry_open: int icom_rig_close(RIG *rig) { // Nothing to do yet - struct rig_state *rs = &rig->state; + struct rig_state *rs = STATE(rig); struct icom_priv_data *priv = (struct icom_priv_data *) rs->priv; ENTERFUNC; @@ -1284,9 +1285,10 @@ int icom_rig_close(RIG *rig) static int icom_set_default_vfo(RIG *rig) { int retval; + struct rig_state *rs = STATE(rig); rig_debug(RIG_DEBUG_TRACE, "%s: called, curr_vfo=%s\n", __func__, - rig_strvfo(rig->state.current_vfo)); + rig_strvfo(rs->current_vfo)); // we need to know if dual watch is on if (VFO_HAS_MAIN_SUB_A_B_ONLY) @@ -1309,7 +1311,7 @@ static int icom_set_default_vfo(RIG *rig) RETURNFUNC2(retval); } - rig->state.current_vfo = RIG_VFO_MAIN; + rs->current_vfo = RIG_VFO_MAIN; RETURNFUNC2(RIG_OK); } @@ -1319,7 +1321,7 @@ static int icom_set_default_vfo(RIG *rig) __func__); HAMLIB_TRACE; retval = rig_set_vfo(rig, RIG_VFO_MAIN); // we'll default to Main in this case - rig->state.current_vfo = RIG_VFO_MAIN; + rs->current_vfo = RIG_VFO_MAIN; } else if (VFO_HAS_A_B) { @@ -1328,11 +1330,11 @@ static int icom_set_default_vfo(RIG *rig) HAMLIB_TRACE; retval = RIG_OK; - if (rig->state.current_vfo != RIG_VFO_A) + if (rs->current_vfo != RIG_VFO_A) { retval = rig_set_vfo(rig, RIG_VFO_A); // we'll default to VFOA for all others - rig->state.current_vfo = RIG_VFO_A; + rs->current_vfo = RIG_VFO_A; } } else @@ -1341,7 +1343,7 @@ static int icom_set_default_vfo(RIG *rig) rig_debug(RIG_DEBUG_TRACE, "%s: Unknown VFO setup so setting default as VFOA\n", __func__); - rig->state.current_vfo = RIG_VFO_A; + rs->current_vfo = RIG_VFO_A; retval = RIG_OK; } @@ -1351,7 +1353,7 @@ static int icom_set_default_vfo(RIG *rig) } rig_debug(RIG_DEBUG_TRACE, "%s: curr_vfo now %s\n", __func__, - rig_strvfo(rig->state.current_vfo)); + rig_strvfo(rs->current_vfo)); RETURNFUNC2(RIG_OK); } @@ -1395,7 +1397,7 @@ int icom_band_changing(RIG *rig, freq_t test_freq) static int icom_set_freq_x25(RIG *rig, vfo_t vfo, freq_t freq, int freq_len, unsigned char *freqbuf) { - struct rig_state *rs = &rig->state; + struct rig_state *rs = STATE(rig); struct icom_priv_data *priv = (struct icom_priv_data *) rs->priv; const struct icom_priv_caps *priv_caps = rig->caps->priv; unsigned char ackbuf[MAXFRAMELEN]; @@ -1428,7 +1430,7 @@ static int icom_set_freq_x25(RIG *rig, vfo_t vfo, freq_t freq, int freq_len, static int icom_get_freq_x25(RIG *rig, vfo_t vfo, int *ack_len, unsigned char *ackbuf, int *freqbuf_offset) { - struct rig_state *rs = &rig->state; + struct rig_state *rs = STATE(rig); struct icom_priv_data *priv = (struct icom_priv_data *) rs->priv; const struct icom_priv_caps *priv_caps = rig->caps->priv; int retval; @@ -1464,7 +1466,7 @@ static int icom_get_freq_x25(RIG *rig, vfo_t vfo, int *ack_len, static int icom_get_tx_freq(RIG *rig, int *ack_len, unsigned char *ackbuf, int *freqbuf_offset) { - struct rig_state *rs = &rig->state; + struct rig_state *rs = STATE(rig); struct icom_priv_data *priv = (struct icom_priv_data *) rs->priv; const struct icom_priv_caps *priv_caps = rig->caps->priv; int retval; @@ -1492,11 +1494,11 @@ static int icom_get_tx_freq(RIG *rig, int *ack_len, unsigned char *ackbuf, /* * icom_set_freq - * Assumes rig!=NULL, rig->state.priv!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL */ int icom_set_freq(RIG *rig, vfo_t vfo, freq_t freq) { - struct rig_state *rs = &rig->state; + struct rig_state *rs = STATE(rig); struct icom_priv_data *priv = (struct icom_priv_data *) rs->priv; unsigned char freqbuf[MAXFRAMELEN], ackbuf[MAXFRAMELEN]; int freq_len, ack_len = sizeof(ackbuf), retval; @@ -1525,8 +1527,8 @@ int icom_set_freq(RIG *rig, vfo_t vfo, freq_t freq) // Switch to the desired VFO (if needed) if frequency is not targetable HAMLIB_TRACE; rig_debug(RIG_DEBUG_TRACE, "%s: set_vfo_curr=%s\n", __func__, - rig_strvfo(rig->state.current_vfo)); - retval = set_vfo_curr(rig, vfo, rig->state.current_vfo); + rig_strvfo(rs->current_vfo)); + retval = set_vfo_curr(rig, vfo, rs->current_vfo); if (retval != RIG_OK) { @@ -1592,7 +1594,7 @@ int icom_set_freq(RIG *rig, vfo_t vfo, freq_t freq) &ack_len); } - int retval2 = set_vfo_curr(rig, vfo_save, rig->state.current_vfo); + int retval2 = set_vfo_curr(rig, vfo_save, rs->current_vfo); if (retval == RIG_OK) { @@ -1673,12 +1675,12 @@ int icom_set_freq(RIG *rig, vfo_t vfo, freq_t freq) /* * icom_get_freq - * Assumes rig!=NULL, rig->state.priv!=NULL, freq!=NULL, Main=VFOA, Sub=VFOB + * Assumes rig!=NULL, STATE(rig)->priv!=NULL, freq!=NULL, Main=VFOA, Sub=VFOB * Note: old rig may return less than 4/5 bytes for get_freq */ int icom_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) { - struct rig_state *rs = &rig->state; + struct rig_state *rs = STATE(rig); struct icom_priv_data *priv = (struct icom_priv_data *) rs->priv; unsigned char freqbuf[MAXFRAMELEN]; int freq_len = sizeof(freqbuf); @@ -1686,10 +1688,10 @@ int icom_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) int retval = RIG_OK; int civ_731_mode_save = 0; int force_vfo_swap = 0; - vfo_t vfo_save = rig->state.current_vfo; + vfo_t vfo_save = rs->current_vfo; rig_debug(RIG_DEBUG_VERBOSE, "%s called for %s, curr_vfo=%s\n", __func__, - rig_strvfo(vfo), rig_strvfo(rig->state.current_vfo)); + rig_strvfo(vfo), rig_strvfo(rs->current_vfo)); if (priv->serial_USB_echo_off == -1) { @@ -1770,7 +1772,7 @@ int icom_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) { freqbuf_offset = 1; HAMLIB_TRACE; - retval = set_vfo_curr(rig, vfo, rig->state.current_vfo); + retval = set_vfo_curr(rig, vfo, rs->current_vfo); if (retval != RIG_OK) { @@ -1785,7 +1787,7 @@ int icom_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) retval = icom_transaction(rig, C_RD_FREQ, -1, NULL, 0, freqbuf, &freq_len); HAMLIB_TRACE; - int retval2 = set_vfo_curr(rig, vfo_save, rig->state.current_vfo); + int retval2 = set_vfo_curr(rig, vfo_save, rs->current_vfo); if (retval == RIG_OK) { @@ -1858,7 +1860,7 @@ int icom_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) if (vfo == RIG_VFO_MEM && civ_731_mode_save) { priv->civ_731_mode = 1; } rig_debug(RIG_DEBUG_VERBOSE, "%s exit vfo=%s, curr_vfo=%s, freq=%g\n", __func__, - rig_strvfo(vfo), rig_strvfo(rig->state.current_vfo), *freq); + rig_strvfo(vfo), rig_strvfo(rs->current_vfo), *freq); RETURNFUNC2(RIG_OK); } @@ -1955,7 +1957,7 @@ pbwidth_t icom_get_dsp_flt(RIG *rig, rmode_t mode) unsigned char resbuf[MAXFRAMELEN]; value_t rfwidth; unsigned char fw_sub_cmd = RIG_IS_IC7200 ? 0x02 : S_MEM_FILT_WDTH; - struct icom_priv_data *priv = (struct icom_priv_data *) rig->state.priv; + struct icom_priv_data *priv = (struct icom_priv_data *) STATE(rig)->priv; rig_debug(RIG_DEBUG_VERBOSE, "%s called, mode=%s\n", __func__, rig_strrmode(mode)); @@ -2055,7 +2057,7 @@ int icom_set_dsp_flt(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) unsigned char flt_ext; value_t rfwidth; int ack_len = sizeof(ackbuf), flt_idx; - struct icom_priv_data *priv = (struct icom_priv_data *) rig->state.priv; + struct icom_priv_data *priv = (struct icom_priv_data *) STATE(rig)->priv; unsigned char fw_sub_cmd = RIG_IS_IC7200 ? 0x02 : S_MEM_FILT_WDTH; ENTERFUNC; @@ -2160,18 +2162,18 @@ int icom_set_dsp_flt(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) /* * icom_set_mode_without_data - * Assumes rig!=NULL, rig->state.priv!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL */ static int icom_set_mode_without_data(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) { - struct rig_state *rs = &rig->state; + struct rig_state *rs = STATE(rig); struct icom_priv_data *priv = (struct icom_priv_data *) rs->priv; const struct icom_priv_caps *priv_caps = (const struct icom_priv_caps *) rig->caps->priv; const struct icom_priv_data *priv_data = - (const struct icom_priv_data *) rig->state.priv; + (const struct icom_priv_data *) rs->priv; unsigned char ackbuf[MAXFRAMELEN]; unsigned char icmode; signed char icmode_ext; @@ -2250,7 +2252,7 @@ static int icom_set_mode_without_data(RIG *rig, vfo_t vfo, rmode_t mode, static int icom_get_mode_x26(RIG *rig, vfo_t vfo, int *mode_len, unsigned char *modebuf) { - struct icom_priv_data *priv = rig->state.priv; + struct icom_priv_data *priv = STATE(rig)->priv; const struct icom_priv_caps *priv_caps = rig->caps->priv; int retval; @@ -2290,7 +2292,7 @@ static int icom_set_mode_x26(RIG *rig, vfo_t vfo, rmode_t mode, rmode_t icom_mode, int datamode, int filter) { - struct icom_priv_data *priv = rig->state.priv; + struct icom_priv_data *priv = STATE(rig)->priv; const struct icom_priv_caps *priv_caps = rig->caps->priv; int retval; unsigned char buf[3]; @@ -2369,7 +2371,7 @@ static int icom_set_mode_x26(RIG *rig, vfo_t vfo, rmode_t mode, */ int icom_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) { - struct rig_state *rs = &rig->state; + struct rig_state *rs = STATE(rig); const struct icom_priv_data *priv = rs->priv; const struct icom_priv_caps *priv_caps = rig->caps->priv; unsigned char ackbuf[MAXFRAMELEN]; @@ -2397,7 +2399,7 @@ int icom_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) if (!(rs->targetable_vfo & RIG_TARGETABLE_MODE) || force_vfo_swap) { - retval = set_vfo_curr(rig, vfo, rig->state.current_vfo); + retval = set_vfo_curr(rig, vfo, rs->current_vfo); if (retval != RIG_OK) { @@ -2412,7 +2414,7 @@ int icom_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) if (!(rs->targetable_vfo & RIG_TARGETABLE_MODE) || force_vfo_swap) { - int retval2 = set_vfo_curr(rig, vfo_save, rig->state.current_vfo); + int retval2 = set_vfo_curr(rig, vfo_save, rs->current_vfo); if (retval == RIG_OK) { @@ -2570,7 +2572,7 @@ int icom_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) __func__); } - int retval2 = set_vfo_curr(rig, vfo_save, rig->state.current_vfo); + int retval2 = set_vfo_curr(rig, vfo_save, rs->current_vfo); if (retval == RIG_OK) { @@ -2582,14 +2584,14 @@ int icom_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) /* * icom_get_mode_without_data - * Assumes rig!=NULL, rig->state.priv!=NULL, mode!=NULL, width!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL, mode!=NULL, width!=NULL * * TODO: IC-781 doesn't send filter width in wide filter mode, making the frame 1 byte short. */ static int icom_get_mode_without_data(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width, int force_vfo_swap) { - struct rig_state *rs = &rig->state; + struct rig_state *rs = STATE(rig); struct icom_priv_data *priv_data = rs->priv; const struct icom_priv_caps *priv_caps = rig->caps->priv; unsigned char modebuf[MAXFRAMELEN]; @@ -2709,7 +2711,7 @@ static int icom_get_mode_without_data(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t filter_width = 1; - if (vfo == rig->state.current_vfo) + if (vfo == rs->current_vfo) { if (!((RIG_IS_IC7300 || RIG_IS_IC9700) && (*mode == RIG_MODE_FM || *mode == RIG_MODE_PKTFM))) // can't do this in FM mode filter_width = icom_get_dsp_flt(rig, *mode); @@ -2746,7 +2748,7 @@ static int icom_get_mode_without_data(RIG *rig, vfo_t vfo, rmode_t *mode, */ int icom_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) { - struct rig_state *rs = &rig->state; + struct rig_state *rs = STATE(rig); struct icom_priv_data *priv = rs->priv; const struct icom_priv_caps *priv_caps = rig->caps->priv; unsigned char databuf[MAXFRAMELEN]; @@ -2770,7 +2772,7 @@ int icom_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) if (!(rs->targetable_vfo & RIG_TARGETABLE_MODE) || force_vfo_swap) { - retval = set_vfo_curr(rig, vfo, rig->state.current_vfo); + retval = set_vfo_curr(rig, vfo, rs->current_vfo); if (retval != RIG_OK) { @@ -2792,7 +2794,7 @@ int icom_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) { if (!(rs->targetable_vfo & RIG_TARGETABLE_MODE) || force_vfo_swap) { - int retval2 = set_vfo_curr(rig, vfo_save, rig->state.current_vfo); + int retval2 = set_vfo_curr(rig, vfo_save, rs->current_vfo); if (retval == RIG_OK) { @@ -2887,7 +2889,7 @@ int icom_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) if (!(rs->targetable_vfo & RIG_TARGETABLE_MODE) || force_vfo_swap) { - int retval2 = set_vfo_curr(rig, vfo_save, rig->state.current_vfo); + int retval2 = set_vfo_curr(rig, vfo_save, rs->current_vfo); if (retval == RIG_OK) { @@ -2900,7 +2902,7 @@ int icom_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) /* * icom_get_vfo - * Assumes rig!=NULL, rig->state.priv!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL * * Only some recent Icom rigs support reading the selected band (between Main/Sub). * Even then, they cannot distinguish between VFO A/B. @@ -2943,7 +2945,7 @@ int icom_get_vfo(RIG *rig, vfo_t *vfo) /* * icom_set_vfo - * Assumes rig!=NULL, rig->state.priv!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL */ int icom_set_vfo(RIG *rig, vfo_t vfo) { @@ -2959,7 +2961,7 @@ int icom_set_vfo(RIG *rig, vfo_t vfo) if (vfo == RIG_VFO_CURR) { rig_debug(RIG_DEBUG_TRACE, "%s: Asking for currVFO, currVFO=%s\n", __func__, - rig_strvfo(rig->state.current_vfo)); + rig_strvfo(rs->current_vfo)); RETURNFUNC2(RIG_OK); } @@ -3042,10 +3044,10 @@ int icom_set_vfo(RIG *rig, vfo_t vfo) RETURNFUNC2(-RIG_EINVAL); } - if (vfo != rig->state.current_vfo) + if (vfo != rs->current_vfo) { rig_debug(RIG_DEBUG_TRACE, "%s: VFO changing from %s to %s\n", __func__, - rig_strvfo(rig->state.current_vfo), rig_strvfo(vfo)); + rig_strvfo(rs->current_vfo), rig_strvfo(vfo)); cachep->freqCurr = 0; // reset current frequency so set_freq works 1st time } @@ -3109,7 +3111,7 @@ int icom_set_vfo(RIG *rig, vfo_t vfo) RETURNFUNC2(retval); } - rig->state.current_vfo = vfo; + rs->current_vfo = vfo; RETURNFUNC2(RIG_OK); case RIG_VFO_MEM: @@ -3126,7 +3128,7 @@ int icom_set_vfo(RIG *rig, vfo_t vfo) RETURNFUNC2(retval); } - rig->state.current_vfo = vfo; + rs->current_vfo = vfo; RETURNFUNC2(RIG_OK); case RIG_VFO_MAIN_A: // we need to select Main before setting VFO @@ -3174,7 +3176,7 @@ int icom_set_vfo(RIG *rig, vfo_t vfo) break; case RIG_VFO_OTHER: - switch (rig->state.current_vfo) + switch (rs->current_vfo) { case RIG_VFO_CURR: break; // no change needed @@ -3225,7 +3227,7 @@ int icom_set_vfo(RIG *rig, vfo_t vfo) default: rig_debug(RIG_DEBUG_ERR, "%s: unknown vfo '%s'\n", __func__, - rig_strvfo(rig->state.current_vfo)); + rig_strvfo(rs->current_vfo)); } default: @@ -3251,9 +3253,9 @@ int icom_set_vfo(RIG *rig, vfo_t vfo) RETURNFUNC2(retval); } - rig->state.current_vfo = vfo; + rs->current_vfo = vfo; rig_debug(RIG_DEBUG_TRACE, "%s: line#%d curr_vfo=%s\n", __func__, __LINE__, - rig_strvfo(rig->state.current_vfo)); + rig_strvfo(rs->current_vfo)); RETURNFUNC2(RIG_OK); } @@ -3419,11 +3421,11 @@ int icom_get_cmd(RIG *rig, vfo_t vfo, struct cmdparams *par, value_t *val) /* * icom_set_level - * Assumes rig!=NULL, rig->state.priv!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL */ int icom_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) { - struct rig_state *rs; + struct rig_state *rs = STATE(rig); unsigned char cmdbuf[MAXFRAMELEN], ackbuf[MAXFRAMELEN]; int cmd_len, ack_len = sizeof(ackbuf); int lvl_cn, lvl_sc; /* Command Number, Subcommand */ @@ -3444,8 +3446,6 @@ int icom_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) } } - rs = &rig->state; - /* * Many levels of float type are in [0.0..1.0] range */ @@ -3655,7 +3655,7 @@ int icom_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) icom_val = 0; const float *agcp = agc_level; - if (rig->state.current_mode == RIG_MODE_AM) { agcp = agc_level2; } + if (rs->current_mode == RIG_MODE_AM) { agcp = agc_level2; } rig_debug(RIG_DEBUG_ERR, "%s: val.f=%f\n", __func__, val.f); @@ -3973,7 +3973,7 @@ int icom_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) /* * icom_get_level - * Assumes rig!=NULL, rig->state.priv!=NULL, val!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL, val!=NULL * */ int icom_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) @@ -4005,7 +4005,7 @@ int icom_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) rig_debug(RIG_DEBUG_TRACE, "%s: no extcmd found\n", __func__); - rs = &rig->state; + rs = STATE(rig); cmd_len = 0; @@ -4582,7 +4582,7 @@ int icom_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) case RIG_LEVEL_AGC_TIME: // some rigs have different level interpretaions for different modes - if (rig->state.current_mode == RIG_MODE_AM) + if (rs->current_mode == RIG_MODE_AM) { val->f = agc_level2[icom_val]; } @@ -5078,7 +5078,7 @@ int icom_set_ext_cmd(RIG *rig, vfo_t vfo, hamlib_token_t token, value_t val) } /* - * Assumes rig!=NULL, rig->state.priv!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL */ int icom_set_conf(RIG *rig, hamlib_token_t token, const char *val) { @@ -5086,7 +5086,7 @@ int icom_set_conf(RIG *rig, hamlib_token_t token, const char *val) struct rig_state *rs; ENTERFUNC; - rs = &rig->state; + rs = STATE(rig); priv = (struct icom_priv_data *) rs->priv; switch (token) @@ -5160,7 +5160,7 @@ int icom_set_conf(RIG *rig, hamlib_token_t token, const char *val) /* * assumes rig!=NULL, - * Assumes rig!=NULL, rig->state.priv!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL * and val points to a buffer big enough to hold the conf value. */ int icom_get_conf2(RIG *rig, hamlib_token_t token, char *val, int val_len) @@ -5169,7 +5169,7 @@ int icom_get_conf2(RIG *rig, hamlib_token_t token, char *val, int val_len) struct rig_state *rs; ENTERFUNC; - rs = &rig->state; + rs = STATE(rig); priv = (struct icom_priv_data *) rs->priv; switch (token) @@ -5199,7 +5199,7 @@ int icom_get_conf(RIG *rig, hamlib_token_t token, char *val) /* * icom_set_ptt - * Assumes rig!=NULL, rig->state.priv!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL */ int icom_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt) { @@ -5227,7 +5227,7 @@ int icom_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt) /* * icom_get_ptt - * Assumes rig!=NULL, rig->state.priv!=NULL, ptt!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL, ptt!=NULL */ int icom_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt) { @@ -5268,7 +5268,7 @@ int icom_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt) /* * icom_get_dcd - * Assumes rig!=NULL, rig->state.priv!=NULL, ptt!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL, ptt!=NULL */ int icom_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd) { @@ -5307,7 +5307,7 @@ int icom_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd) /* * icom_set_rptr_shift - * Assumes rig!=NULL, rig->state.priv!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL */ int icom_set_rptr_shift(RIG *rig, vfo_t vfo, rptr_shift_t rptr_shift) { @@ -5356,7 +5356,7 @@ int icom_set_rptr_shift(RIG *rig, vfo_t vfo, rptr_shift_t rptr_shift) /* * icom_get_rptr_shift - * Assumes rig!=NULL, rig->state.priv!=NULL, rptr_shift!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL, rptr_shift!=NULL * will not work for IC-746 Pro * NOTE: seems not to work (tested on IC-706MkIIG), please report --SF */ @@ -5418,7 +5418,7 @@ int icom_get_rptr_shift(RIG *rig, vfo_t vfo, rptr_shift_t *rptr_shift) /* * icom_set_rptr_offs - * Assumes rig!=NULL, rig->state.priv!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL */ int icom_set_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t rptr_offs) { @@ -5455,7 +5455,7 @@ int icom_set_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t rptr_offs) /* * icom_get_rptr_offs - * Assumes rig!=NULL, rig->state.priv!=NULL, rptr_offs!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL, rptr_offs!=NULL */ int icom_get_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t *rptr_offs) { @@ -5592,7 +5592,7 @@ int icom_get_split_vfos(RIG *rig, vfo_t *rx_vfo, vfo_t *tx_vfo) /* * icom_set_split_freq - * Assumes rig!=NULL, rig->state.priv!=NULL, + * Assumes rig!=NULL, STATE(rig)->priv!=NULL, * icom_set_vfo,icom_set_freq works for this rig * * Assumes also that the current VFO is the rx VFO. @@ -5795,7 +5795,7 @@ int icom_set_split_freq(RIG *rig, vfo_t vfo, freq_t tx_freq) /* * icom_get_split_freq - * Assumes rig!=NULL, rig->state.priv!=NULL, rx_freq!=NULL, tx_freq!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL, rx_freq!=NULL, tx_freq!=NULL * icom_set_vfo,icom_get_freq works for this rig */ int icom_get_split_freq(RIG *rig, vfo_t vfo, freq_t *tx_freq) @@ -5812,7 +5812,7 @@ int icom_get_split_freq(RIG *rig, vfo_t vfo, freq_t *tx_freq) rig_debug(RIG_DEBUG_VERBOSE, "%s called %s\n", __func__, rig_strvfo(vfo)); rig_debug(RIG_DEBUG_VERBOSE, "%s: curr_vfo=%s\n", __func__, - rig_strvfo(rig->state.current_vfo)); + rig_strvfo(rs->current_vfo)); if (RIG_IS_IC910) { @@ -5835,9 +5835,9 @@ int icom_get_split_freq(RIG *rig, vfo_t vfo, freq_t *tx_freq) } rig_debug(RIG_DEBUG_VERBOSE, "%s curr_vfo=%s\n", __func__, - rig_strvfo(rig->state.current_vfo)); + rig_strvfo(rs->current_vfo)); - if (rig->state.current_vfo == RIG_VFO_NONE) + if (rs->current_vfo == RIG_VFO_NONE) { HAMLIB_TRACE; icom_set_default_vfo(rig); @@ -5969,7 +5969,7 @@ int icom_get_split_freq(RIG *rig, vfo_t vfo, freq_t *tx_freq) /* * icom_set_split_mode - * Assumes rig!=NULL, rig->state.priv!=NULL, + * Assumes rig!=NULL, STATE(rig)->priv!=NULL, * icom_set_vfo,icom_set_mode works for this rig */ int icom_set_split_mode(RIG *rig, vfo_t vfo, rmode_t tx_mode, @@ -6076,14 +6076,14 @@ int icom_set_split_mode(RIG *rig, vfo_t vfo, rmode_t tx_mode, /* * icom_get_split_mode - * Assumes rig!=NULL, rig->state.priv!=NULL, + * Assumes rig!=NULL, STATE(rig)->priv!=NULL, * rx_mode!=NULL, rx_width!=NULL, tx_mode!=NULL, tx_width!=NULL * icom_set_vfo,icom_get_mode works for this rig */ int icom_get_split_mode(RIG *rig, vfo_t vfo, rmode_t *tx_mode, pbwidth_t *tx_width) { - struct rig_state *rs = &rig->state; + struct rig_state *rs = STATE(rig); struct icom_priv_data *priv = rs->priv; unsigned char ackbuf[MAXFRAMELEN]; int ack_len = sizeof(ackbuf); @@ -6181,7 +6181,7 @@ int icom_get_split_mode(RIG *rig, vfo_t vfo, rmode_t *tx_mode, /* * icom_set_split_freq_mode - * Assumes rig!=NULL, rig->state.priv!=NULL, + * Assumes rig!=NULL, STATE(rig)->priv!=NULL, * icom_set_vfo,icom_set_mode works for this rig */ int icom_set_split_freq_mode(RIG *rig, vfo_t vfo, freq_t tx_freq, @@ -6354,7 +6354,7 @@ int icom_set_split_freq_mode(RIG *rig, vfo_t vfo, freq_t tx_freq, /* * icom_get_split_freq_mode - * Assumes rig!=NULL, rig->state.priv!=NULL, + * Assumes rig!=NULL, STATE(rig)->priv!=NULL, * rx_mode!=NULL, rx_width!=NULL, tx_mode!=NULL, tx_width!=NULL * icom_set_vfo,icom_get_mode works for this rig */ @@ -6479,7 +6479,7 @@ int icom_get_split_freq_mode(RIG *rig, vfo_t vfo, freq_t *tx_freq, /* * icom_set_split - * Assumes rig!=NULL, rig->state.priv!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL */ int icom_set_split_vfo(RIG *rig, vfo_t rx_vfo, split_t split, vfo_t tx_vfo) { @@ -6499,7 +6499,7 @@ int icom_set_split_vfo(RIG *rig, vfo_t rx_vfo, split_t split, vfo_t tx_vfo) rig_debug(RIG_DEBUG_VERBOSE, "%s called rx_vfo='%s', split=%d, tx_vfo=%s, curr_vfo=%s\n", __func__, rig_strvfo(rx_vfo), split, rig_strvfo(tx_vfo), - rig_strvfo(rig->state.current_vfo)); + rig_strvfo(rs->current_vfo)); // This should automatically switch between satmode on/off based on the requested split rx_vfo if (rig->caps->has_get_func & RIG_FUNC_SATMODE) @@ -6599,7 +6599,7 @@ int icom_set_split_vfo(RIG *rig, vfo_t rx_vfo, split_t split, vfo_t tx_vfo) rig_debug(RIG_DEBUG_VERBOSE, "%s: curr_vfo=%s rx_vfo=%s tx_vfo=%s split=%d\n", - __func__, rig_strvfo(rig->state.current_vfo), + __func__, rig_strvfo(rs->current_vfo), rig_strvfo(rx_vfo), rig_strvfo(tx_vfo), split); RETURNFUNC2(RIG_OK); @@ -6607,7 +6607,7 @@ int icom_set_split_vfo(RIG *rig, vfo_t rx_vfo, split_t split, vfo_t tx_vfo) /* * icom_get_split_vfo - * Assumes rig!=NULL, rig->state.priv!=NULL, split!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL, split!=NULL * * Does not appear to be supported by any mode? * \sa icom_mem_get_split_vfo() @@ -6687,7 +6687,7 @@ int icom_get_split_vfo(RIG *rig, vfo_t rx_vfo, split_t *split, vfo_t *tx_vfo) /* * icom_mem_get_split_vfo - * Assumes rig!=NULL, rig->state.priv!=NULL, split!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL, split!=NULL */ int icom_mem_get_split_vfo(RIG *rig, vfo_t vfo, split_t *split, vfo_t *tx_vfo) @@ -6699,7 +6699,7 @@ int icom_mem_get_split_vfo(RIG *rig, vfo_t vfo, split_t *split, /* this hacks works only when in memory mode * I have no clue how to detect split in regular VFO mode */ - if (rig->state.current_vfo != RIG_VFO_MEM || + if (STATE(rig)->current_vfo != RIG_VFO_MEM || !rig_has_vfo_op(rig, RIG_OP_XCHG)) { *split = CACHE(rig)->split; // we set this but still return ENAVAIL @@ -6824,14 +6824,14 @@ int icom_get_ts(RIG *rig, vfo_t vfo, shortfreq_t *ts) /* * icom_set_func - * Assumes rig!=NULL, rig->state.priv!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL */ int icom_set_func(RIG *rig, vfo_t vfo, setting_t func, int status) { unsigned char fctbuf[MAXFRAMELEN], ackbuf[MAXFRAMELEN]; int fct_len, ack_len, retval; int fct_cn, fct_sc; /* Command Number, Subcommand */ - struct rig_state *rs = &rig->state; + struct rig_state *rs = STATE(rig); struct icom_priv_data *priv = (struct icom_priv_data *) rs->priv; ENTERFUNC; @@ -7128,7 +7128,7 @@ int icom_set_func(RIG *rig, vfo_t vfo, setting_t func, int status) /* * icom_get_func - * Assumes rig!=NULL, rig->state.priv!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL * FIXME: IC8500 and no-sc, any support? */ int icom_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status) @@ -7503,7 +7503,7 @@ int icom_get_parm(RIG *rig, setting_t parm, value_t *val) /* * icom_set_ctcss_tone - * Assumes rig!=NULL, rig->state.priv!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL * * Works for 746 pro and should work for 756 xx and 7800 */ @@ -7557,7 +7557,7 @@ int icom_set_ctcss_tone(RIG *rig, vfo_t vfo, tone_t tone) /* * icom_get_ctcss_tone - * Assumes rig!=NULL, rig->state.priv!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL */ int icom_get_ctcss_tone(RIG *rig, vfo_t vfo, tone_t *tone) { @@ -7608,7 +7608,7 @@ int icom_get_ctcss_tone(RIG *rig, vfo_t vfo, tone_t *tone) /* * icom_set_ctcss_sql - * Assumes rig!=NULL, rig->state.priv!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL */ int icom_set_ctcss_sql(RIG *rig, vfo_t vfo, tone_t tone) { @@ -7656,7 +7656,7 @@ int icom_set_ctcss_sql(RIG *rig, vfo_t vfo, tone_t tone) /* * icom_get_ctcss_sql - * Assumes rig!=NULL, rig->state.priv!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL */ int icom_get_ctcss_sql(RIG *rig, vfo_t vfo, tone_t *tone) { @@ -7701,7 +7701,7 @@ int icom_get_ctcss_sql(RIG *rig, vfo_t vfo, tone_t *tone) /* * icom_set_dcs_code - * Assumes rig!=NULL, rig->state.priv!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL */ int icom_set_dcs_code(RIG *rig, vfo_t vfo, tone_t code) { @@ -7748,7 +7748,7 @@ int icom_set_dcs_code(RIG *rig, vfo_t vfo, tone_t code) /* * icom_get_dcs_code - * Assumes rig!=NULL, rig->state.priv!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL */ int icom_get_dcs_code(RIG *rig, vfo_t vfo, tone_t *code) { @@ -7798,7 +7798,7 @@ int icom_get_dcs_code(RIG *rig, vfo_t vfo, tone_t *code) /* * icom_set_dcs_sql - * Assumes rig!=NULL, rig->state.priv!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL */ int icom_set_dcs_sql(RIG *rig, vfo_t vfo, tone_t code) { @@ -7845,7 +7845,7 @@ int icom_set_dcs_sql(RIG *rig, vfo_t vfo, tone_t code) /* * icom_get_dcs_sql - * Assumes rig!=NULL, rig->state.priv!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL */ int icom_get_dcs_sql(RIG *rig, vfo_t vfo, tone_t *code) { @@ -7895,7 +7895,7 @@ int icom_get_dcs_sql(RIG *rig, vfo_t vfo, tone_t *code) /* * icom_set_powerstat - * Assumes rig!=NULL, rig->state.priv!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL */ int icom_set_powerstat(RIG *rig, powerstat_t status) { @@ -7908,7 +7908,7 @@ int icom_set_powerstat(RIG *rig, powerstat_t status) int i; int retry; short retry_save, timeout_retry_save; - struct rig_state *rs = &rig->state; + struct rig_state *rs = STATE(rig); hamlib_port_t *rp = RIGPORT(rig); struct icom_priv_data *priv = (struct icom_priv_data *) rs->priv; @@ -8097,7 +8097,7 @@ int icom_set_powerstat(RIG *rig, powerstat_t status) /* * icom_get_powerstat - * Assumes rig!=NULL, rig->state.priv!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL */ int icom_get_powerstat(RIG *rig, powerstat_t *status) { @@ -8169,7 +8169,7 @@ int icom_get_powerstat(RIG *rig, powerstat_t *status) // Modify rig_state powerstat directly to reflect power ON/OFF status, but return the result of rig_get_freq, // because the error could indicate other connectivity issues too - rig->state.powerstat = *status; + STATE(rig)->powerstat = *status; return retval; } else @@ -8184,7 +8184,7 @@ int icom_get_powerstat(RIG *rig, powerstat_t *status) // because the error could indicate other connectivity issues too rig_debug(RIG_DEBUG_WARN, "%s: get powerstat failed, assuming power is off\n", __func__); - rig->state.powerstat = RIG_POWER_OFF; + STATE(rig)->powerstat = RIG_POWER_OFF; RETURNFUNC(retval); } @@ -8197,7 +8197,7 @@ int icom_get_powerstat(RIG *rig, powerstat_t *status) /* * icom_set_mem - * Assumes rig!=NULL, rig->state.priv!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL */ int icom_set_mem(RIG *rig, vfo_t vfo, int ch) { @@ -8228,7 +8228,7 @@ int icom_set_mem(RIG *rig, vfo_t vfo, int ch) /* * icom_set_bank - * Assumes rig!=NULL, rig->state.priv!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL */ int icom_set_bank(RIG *rig, vfo_t vfo, int bank) { @@ -8256,7 +8256,7 @@ int icom_set_bank(RIG *rig, vfo_t vfo, int bank) /* * icom_set_ant - * Assumes rig!=NULL, rig->state.priv!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL */ int icom_set_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t option) { @@ -8382,7 +8382,7 @@ int icom_set_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t option) /* * icom_get_ant - * Assumes rig!=NULL, rig->state.priv!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL * only meaningful for HF */ int icom_get_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t *option, @@ -8474,7 +8474,7 @@ int icom_get_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t *option, /* * icom_vfo_op, Mem/VFO operation - * Assumes rig!=NULL, rig->state.priv!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL */ int icom_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op) { @@ -8490,7 +8490,7 @@ int icom_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op) { case RIG_OP_CPY: mv_cn = C_SET_VFO; - vfo_list = rig->state.vfo_list; + vfo_list = STATE(rig)->vfo_list; if ((vfo_list & (RIG_VFO_A | RIG_VFO_B)) == (RIG_VFO_A | RIG_VFO_B)) { @@ -8575,7 +8575,7 @@ int icom_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op) /* * icom_scan, scan operation - * Assumes rig!=NULL, rig->state.priv!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL */ int icom_scan(RIG *rig, vfo_t vfo, scan_t scan, int ch) { @@ -8818,7 +8818,7 @@ static int icom_parse_spectrum_frame(RIG *rig, size_t length, { struct rig_caps *caps = rig->caps; struct icom_priv_caps *priv_caps = (struct icom_priv_caps *) caps->priv; - struct icom_priv_data *priv = (struct icom_priv_data *) rig->state.priv; + struct icom_priv_data *priv = (struct icom_priv_data *) STATE(rig)->priv; struct icom_spectrum_scope_cache *cache; int division = (int) from_bcd(frame_data + 1, 1 * 2); @@ -8977,7 +8977,7 @@ int icom_is_async_frame(RIG *rig, size_t frame_length, int icom_process_async_frame(RIG *rig, size_t frame_length, const unsigned char *frame) { - struct rig_state *rs = &rig->state; + struct rig_state *rs = STATE(rig); struct icom_priv_data *priv = (struct icom_priv_data *) rs->priv; rmode_t mode; pbwidth_t width; @@ -9068,7 +9068,7 @@ int icom_decode_event(RIG *rig) ENTERFUNC; - rs = &rig->state; + rs = STATE(rig); priv = (struct icom_priv_data *) rs->priv; frm_len = read_icom_frame(RIGPORT(rig), buf, sizeof(buf)); @@ -9297,7 +9297,7 @@ int icom_stop_voice_mem(RIG *rig, vfo_t vfo) } /* * icom_send_voice_mem - * Assumes rig!=NULL, rig->state.priv!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL */ int icom_send_voice_mem(RIG *rig, vfo_t vfo, int ch) { @@ -9327,7 +9327,7 @@ int icom_send_voice_mem(RIG *rig, vfo_t vfo, int ch) /* * icom_get_freq_range - * Assumes rig!=NULL, rig->state.priv!=NULL + * Assumes rig!=NULL, STATE(rig)->priv!=NULL * Always returns RIG_OK */ int icom_get_freq_range(RIG *rig) @@ -9339,7 +9339,7 @@ int icom_get_freq_range(RIG *rig) unsigned char cmdbuf[MAXFRAMELEN]; unsigned char ackbuf[MAXFRAMELEN]; int ack_len = sizeof(ackbuf); -// struct icom_priv_data *priv = (struct icom_priv_data *) rig->state.priv; +// struct icom_priv_data *priv = (struct icom_priv_data *) STATE(rig)->priv; // int freq_len = priv->civ_731_mode ? 4 : 5; int freq_len = 5; @@ -9399,11 +9399,11 @@ int icom_get_freq_range(RIG *rig) RETURNFUNC2(RIG_OK); } -// Sets rig vfo && rig->state.current_vfo to default VFOA, or current vfo, or the vfo requested +// Sets rig vfo && STATE(rig)->current_vfo to default VFOA, or current vfo, or the vfo requested static int set_vfo_curr(RIG *rig, vfo_t vfo, vfo_t curr_vfo) { int retval; - struct rig_state *rs = &rig->state; + struct rig_state *rs = STATE(rig); rig_debug(RIG_DEBUG_TRACE, "%s: vfo=%s, curr_vfo=%s\n", __func__, rig_strvfo(vfo), rig_strvfo(curr_vfo)); @@ -9473,7 +9473,7 @@ static int set_vfo_curr(RIG *rig, vfo_t vfo, vfo_t curr_vfo) static int icom_get_spectrum_vfo(RIG *rig, vfo_t vfo) { - if (rig->state.targetable_vfo & RIG_TARGETABLE_SPECTRUM) + if (STATE(rig)->targetable_vfo & RIG_TARGETABLE_SPECTRUM) { RETURNFUNC2(ICOM_GET_VFO_NUMBER(vfo)); } @@ -9746,7 +9746,7 @@ static int icom_is_x25x26_potentially_supported(RIG *rig) static void icom_set_x25x26_ability(RIG *rig, int status) { - struct icom_priv_data *priv = rig->state.priv; + struct icom_priv_data *priv = STATE(rig)->priv; if (!icom_is_x25x26_potentially_supported(rig)) { @@ -9766,6 +9766,7 @@ static int icom_get_vfo_number_x25x26(RIG *rig, vfo_t vfo) { int vfo_number = 0x00; struct rig_cache *cachep = CACHE(rig); + struct rig_state *rs = STATE(rig); // Rigs with *only* Main/Sub VFOs can directly address VFOs: 0 = Main, 1 = Sub if (RIG_IS_IC7600 || RIG_IS_IC7610 || RIG_IS_IC7800 || RIG_IS_IC785X) @@ -9774,7 +9775,7 @@ static int icom_get_vfo_number_x25x26(RIG *rig, vfo_t vfo) if (actual_vfo == RIG_VFO_CURR) { - actual_vfo = rig->state.current_vfo; + actual_vfo = rs->current_vfo; } if (actual_vfo & (RIG_VFO_B | RIG_VFO_SUB)) @@ -9799,7 +9800,7 @@ static int icom_get_vfo_number_x25x26(RIG *rig, vfo_t vfo) RIG_VFO_B | RIG_VFO_SUB | RIG_VFO_SUB_B | RIG_VFO_MAIN_B | RIG_VFO_OTHER; // Check if we are on the requested VFO already - if (rig->state.current_vfo & vfo_unselected) + if (rs->current_vfo & vfo_unselected) { HAMLIB_TRACE; vfo_unselected = @@ -9807,7 +9808,7 @@ static int icom_get_vfo_number_x25x26(RIG *rig, vfo_t vfo) } // Check if we are not on the unselected VFO - if ((vfo & vfo_unselected) && !(rig->state.current_vfo & vfo_unselected)) + if ((vfo & vfo_unselected) && !(rs->current_vfo & vfo_unselected)) { HAMLIB_TRACE; vfo_number = 0x01; // unselected VFO @@ -9820,7 +9821,7 @@ static int icom_get_vfo_number_x25x26(RIG *rig, vfo_t vfo) rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): current_vfo=%s, vfo=%s -> vfo_number=%d\n", __func__, __LINE__, - rig_strvfo(rig->state.current_vfo), rig_strvfo(vfo), vfo_number); + rig_strvfo(rs->current_vfo), rig_strvfo(vfo), vfo_number); return vfo_number; } diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h index 131db64b9..2e17b95c8 100644 --- a/rigs/icom/icom.h +++ b/rigs/icom/icom.h @@ -521,87 +521,87 @@ extern struct rig_caps x5105_caps; extern struct rig_caps icr8600_caps; extern struct rig_caps icr30_caps; -#define RIG_IS_IC1271 (rig->state.rig_model == RIG_MODEL_IC1271) -#define RIG_IS_IC1275 (rig->state.rig_model == RIG_MODEL_IC1275) -#define RIG_IS_IC271 (rig->state.rig_model == RIG_MODEL_IC271) -#define RIG_IS_IC2730 (rig->state.rig_model == RIG_MODEL_IC2730) -#define RIG_IS_IC275 (rig->state.rig_model == RIG_MODEL_IC275) -#define RIG_IS_IC375 (rig->state.rig_model == RIG_MODEL_IC375) -#define RIG_IS_IC471 (rig->state.rig_model == RIG_MODEL_IC471) -#define RIG_IS_IC475 (rig->state.rig_model == RIG_MODEL_IC475) -#define RIG_IS_IC575 (rig->state.rig_model == RIG_MODEL_IC575) -#define RIG_IS_IC7000 (rig->state.rig_model == RIG_MODEL_IC7000) -#define RIG_IS_IC703 (rig->state.rig_model == RIG_MODEL_IC703) -#define RIG_IS_IC705 (rig->state.rig_model == RIG_MODEL_IC705) -#define RIG_IS_IC706 (rig->state.rig_model == RIG_MODEL_IC706) -#define RIG_IS_IC706MKII (rig->state.rig_model == RIG_MODEL_IC706MKII) -#define RIG_IS_IC706MKIIG (rig->state.rig_model == RIG_MODEL_IC706MKIIG) -#define RIG_IS_IC707 (rig->state.rig_model == RIG_MODEL_IC707) -#define RIG_IS_IC7100 (rig->state.rig_model == RIG_MODEL_IC7100) -#define RIG_IS_IC718 (rig->state.rig_model == RIG_MODEL_IC718) -#define RIG_IS_IC7200 (rig->state.rig_model == RIG_MODEL_IC7200) -#define RIG_IS_IC725 (rig->state.rig_model == RIG_MODEL_IC725) -#define RIG_IS_IC726 (rig->state.rig_model == RIG_MODEL_IC726) -#define RIG_IS_IC728 (rig->state.rig_model == RIG_MODEL_IC728) -#define RIG_IS_IC729 (rig->state.rig_model == RIG_MODEL_IC729) -#define RIG_IS_IC7300 (rig->state.rig_model == RIG_MODEL_IC7300) -#define RIG_IS_IC731 (rig->state.rig_model == RIG_MODEL_IC731) -#define RIG_IS_IC735 (rig->state.rig_model == RIG_MODEL_IC735) -#define RIG_IS_IC736 (rig->state.rig_model == RIG_MODEL_IC736) -#define RIG_IS_IC737 (rig->state.rig_model == RIG_MODEL_IC737) -#define RIG_IS_IC738 (rig->state.rig_model == RIG_MODEL_IC738) -#define RIG_IS_IC7410 (rig->state.rig_model == RIG_MODEL_IC7410) -#define RIG_IS_IC746 (rig->state.rig_model == RIG_MODEL_IC746) -#define RIG_IS_IC746PRO (rig->state.rig_model == RIG_MODEL_IC746PRO) -#define RIG_IS_IC751 (rig->state.rig_model == RIG_MODEL_IC751) -#define RIG_IS_IC751A (rig->state.rig_model == RIG_MODEL_IC751A) -#define RIG_IS_IC756 (rig->state.rig_model == RIG_MODEL_IC756) -#define RIG_IS_IC756PRO (rig->state.rig_model == RIG_MODEL_IC756PRO) -#define RIG_IS_IC756PROII (rig->state.rig_model == RIG_MODEL_IC756PROII) -#define RIG_IS_IC756PROIII (rig->state.rig_model == RIG_MODEL_IC756PROIII) -#define RIG_IS_IC7600 (rig->state.rig_model == RIG_MODEL_IC7600) -#define RIG_IS_IC761 (rig->state.rig_model == RIG_MODEL_IC761) -#define RIG_IS_IC7610 (rig->state.rig_model == RIG_MODEL_IC7610) -#define RIG_IS_IC765 (rig->state.rig_model == RIG_MODEL_IC765) -#define RIG_IS_IC7700 (rig->state.rig_model == RIG_MODEL_IC7700) -#define RIG_IS_IC775 (rig->state.rig_model == RIG_MODEL_IC775) -#define RIG_IS_IC78 (rig->state.rig_model == RIG_MODEL_IC78) -#define RIG_IS_IC7800 (rig->state.rig_model == RIG_MODEL_IC7800) -#define RIG_IS_IC781 (rig->state.rig_model == RIG_MODEL_IC781) -#define RIG_IS_IC785X (rig->state.rig_model == RIG_MODEL_IC785x) -#define RIG_IS_IC820 (rig->state.rig_model == RIG_MODEL_IC820) -#define RIG_IS_IC821 (rig->state.rig_model == RIG_MODEL_IC821) -#define RIG_IS_IC821H (rig->state.rig_model == RIG_MODEL_IC821H) -#define RIG_IS_IC905 (rig->state.rig_model == RIG_MODEL_IC905) -#define RIG_IS_IC910 (rig->state.rig_model == RIG_MODEL_IC910) -#define RIG_IS_IC9100 (rig->state.rig_model == RIG_MODEL_IC9100) -#define RIG_IS_IC92D (rig->state.rig_model == RIG_MODEL_IC92D) -#define RIG_IS_IC970 (rig->state.rig_model == RIG_MODEL_IC970) -#define RIG_IS_IC9700 (rig->state.rig_model == RIG_MODEL_IC9700) -#define RIG_IS_IC8101 (rig->state.rig_model == RIG_MODEL_ICF8101) -#define RIG_IS_ICID1 (rig->state.rig_model == RIG_MODEL_ICID1) -#define RIG_IS_ICM700PRO (rig->state.rig_model == RIG_MODEL_IC_M700PRO) -#define RIG_IS_ICM710 (rig->state.rig_model == RIG_MODEL_IC_M710) -#define RIG_IS_ICM802 (rig->state.rig_model == RIG_MODEL_IC_M802) -#define RIG_IS_ICM803 (rig->state.rig_model == RIG_MODEL_IC_M803) -#define RIG_IS_ICR10 (rig->state.rig_model == RIG_MODEL_ICR10) -#define RIG_IS_ICR20 (rig->state.rig_model == RIG_MODEL_ICR20) -#define RIG_IS_ICR30 (rig->state.rig_model == RIG_MODEL_ICR30) -#define RIG_IS_ICR6 (rig->state.rig_model == RIG_MODEL_ICR6) -#define RIG_IS_ICR7000 (rig->state.rig_model == RIG_MODEL_ICR7000) -#define RIG_IS_ICR71 (rig->state.rig_model == RIG_MODEL_ICR71) -#define RIG_IS_ICR7100 (rig->state.rig_model == RIG_MODEL_ICR7100) -#define RIG_IS_ICR72 (rig->state.rig_model == RIG_MODEL_ICR72) -#define RIG_IS_ICR75 (rig->state.rig_model == RIG_MODEL_ICR75) -#define RIG_IS_ICR8500 (rig->state.rig_model == RIG_MODEL_ICR8500) -#define RIG_IS_ICR8600 (rig->state.rig_model == RIG_MODEL_ICR8600) -#define RIG_IS_ICR9000 (rig->state.rig_model == RIG_MODEL_ICR9000) -#define RIG_IS_ICR9500 (rig->state.rig_model == RIG_MODEL_ICR9500) -#define RIG_IS_ICRX7 (rig->state.rig_model == RIG_MODEL_ICRX7) -#define RIG_IS_ID5100 (rig->state.rig_model == RIG_MODEL_ID5100) -#define RIG_IS_OMNIVIP (rig->state.rig_model == RIG_MODEL_OMNIVIP) -#define RIG_IS_OS456 (rig->state.rig_model == RIG_MODEL_OS456) -#define RIG_IS_X5105 (rig->state.rig_model == RIG_MODEL_X5105) -#define RIG_IS_X6100 (rig->state.rig_model == RIG_MODEL_X6100) +#define RIG_IS_IC1271 (STATE(rig)->rig_model == RIG_MODEL_IC1271) +#define RIG_IS_IC1275 (STATE(rig)->rig_model == RIG_MODEL_IC1275) +#define RIG_IS_IC271 (STATE(rig)->rig_model == RIG_MODEL_IC271) +#define RIG_IS_IC2730 (STATE(rig)->rig_model == RIG_MODEL_IC2730) +#define RIG_IS_IC275 (STATE(rig)->rig_model == RIG_MODEL_IC275) +#define RIG_IS_IC375 (STATE(rig)->rig_model == RIG_MODEL_IC375) +#define RIG_IS_IC471 (STATE(rig)->rig_model == RIG_MODEL_IC471) +#define RIG_IS_IC475 (STATE(rig)->rig_model == RIG_MODEL_IC475) +#define RIG_IS_IC575 (STATE(rig)->rig_model == RIG_MODEL_IC575) +#define RIG_IS_IC7000 (STATE(rig)->rig_model == RIG_MODEL_IC7000) +#define RIG_IS_IC703 (STATE(rig)->rig_model == RIG_MODEL_IC703) +#define RIG_IS_IC705 (STATE(rig)->rig_model == RIG_MODEL_IC705) +#define RIG_IS_IC706 (STATE(rig)->rig_model == RIG_MODEL_IC706) +#define RIG_IS_IC706MKII (STATE(rig)->rig_model == RIG_MODEL_IC706MKII) +#define RIG_IS_IC706MKIIG (STATE(rig)->rig_model == RIG_MODEL_IC706MKIIG) +#define RIG_IS_IC707 (STATE(rig)->rig_model == RIG_MODEL_IC707) +#define RIG_IS_IC7100 (STATE(rig)->rig_model == RIG_MODEL_IC7100) +#define RIG_IS_IC718 (STATE(rig)->rig_model == RIG_MODEL_IC718) +#define RIG_IS_IC7200 (STATE(rig)->rig_model == RIG_MODEL_IC7200) +#define RIG_IS_IC725 (STATE(rig)->rig_model == RIG_MODEL_IC725) +#define RIG_IS_IC726 (STATE(rig)->rig_model == RIG_MODEL_IC726) +#define RIG_IS_IC728 (STATE(rig)->rig_model == RIG_MODEL_IC728) +#define RIG_IS_IC729 (STATE(rig)->rig_model == RIG_MODEL_IC729) +#define RIG_IS_IC7300 (STATE(rig)->rig_model == RIG_MODEL_IC7300) +#define RIG_IS_IC731 (STATE(rig)->rig_model == RIG_MODEL_IC731) +#define RIG_IS_IC735 (STATE(rig)->rig_model == RIG_MODEL_IC735) +#define RIG_IS_IC736 (STATE(rig)->rig_model == RIG_MODEL_IC736) +#define RIG_IS_IC737 (STATE(rig)->rig_model == RIG_MODEL_IC737) +#define RIG_IS_IC738 (STATE(rig)->rig_model == RIG_MODEL_IC738) +#define RIG_IS_IC7410 (STATE(rig)->rig_model == RIG_MODEL_IC7410) +#define RIG_IS_IC746 (STATE(rig)->rig_model == RIG_MODEL_IC746) +#define RIG_IS_IC746PRO (STATE(rig)->rig_model == RIG_MODEL_IC746PRO) +#define RIG_IS_IC751 (STATE(rig)->rig_model == RIG_MODEL_IC751) +#define RIG_IS_IC751A (STATE(rig)->rig_model == RIG_MODEL_IC751A) +#define RIG_IS_IC756 (STATE(rig)->rig_model == RIG_MODEL_IC756) +#define RIG_IS_IC756PRO (STATE(rig)->rig_model == RIG_MODEL_IC756PRO) +#define RIG_IS_IC756PROII (STATE(rig)->rig_model == RIG_MODEL_IC756PROII) +#define RIG_IS_IC756PROIII (STATE(rig)->rig_model == RIG_MODEL_IC756PROIII) +#define RIG_IS_IC7600 (STATE(rig)->rig_model == RIG_MODEL_IC7600) +#define RIG_IS_IC761 (STATE(rig)->rig_model == RIG_MODEL_IC761) +#define RIG_IS_IC7610 (STATE(rig)->rig_model == RIG_MODEL_IC7610) +#define RIG_IS_IC765 (STATE(rig)->rig_model == RIG_MODEL_IC765) +#define RIG_IS_IC7700 (STATE(rig)->rig_model == RIG_MODEL_IC7700) +#define RIG_IS_IC775 (STATE(rig)->rig_model == RIG_MODEL_IC775) +#define RIG_IS_IC78 (STATE(rig)->rig_model == RIG_MODEL_IC78) +#define RIG_IS_IC7800 (STATE(rig)->rig_model == RIG_MODEL_IC7800) +#define RIG_IS_IC781 (STATE(rig)->rig_model == RIG_MODEL_IC781) +#define RIG_IS_IC785X (STATE(rig)->rig_model == RIG_MODEL_IC785x) +#define RIG_IS_IC820 (STATE(rig)->rig_model == RIG_MODEL_IC820) +#define RIG_IS_IC821 (STATE(rig)->rig_model == RIG_MODEL_IC821) +#define RIG_IS_IC821H (STATE(rig)->rig_model == RIG_MODEL_IC821H) +#define RIG_IS_IC905 (STATE(rig)->rig_model == RIG_MODEL_IC905) +#define RIG_IS_IC910 (STATE(rig)->rig_model == RIG_MODEL_IC910) +#define RIG_IS_IC9100 (STATE(rig)->rig_model == RIG_MODEL_IC9100) +#define RIG_IS_IC92D (STATE(rig)->rig_model == RIG_MODEL_IC92D) +#define RIG_IS_IC970 (STATE(rig)->rig_model == RIG_MODEL_IC970) +#define RIG_IS_IC9700 (STATE(rig)->rig_model == RIG_MODEL_IC9700) +#define RIG_IS_IC8101 (STATE(rig)->rig_model == RIG_MODEL_ICF8101) +#define RIG_IS_ICID1 (STATE(rig)->rig_model == RIG_MODEL_ICID1) +#define RIG_IS_ICM700PRO (STATE(rig)->rig_model == RIG_MODEL_IC_M700PRO) +#define RIG_IS_ICM710 (STATE(rig)->rig_model == RIG_MODEL_IC_M710) +#define RIG_IS_ICM802 (STATE(rig)->rig_model == RIG_MODEL_IC_M802) +#define RIG_IS_ICM803 (STATE(rig)->rig_model == RIG_MODEL_IC_M803) +#define RIG_IS_ICR10 (STATE(rig)->rig_model == RIG_MODEL_ICR10) +#define RIG_IS_ICR20 (STATE(rig)->rig_model == RIG_MODEL_ICR20) +#define RIG_IS_ICR30 (STATE(rig)->rig_model == RIG_MODEL_ICR30) +#define RIG_IS_ICR6 (STATE(rig)->rig_model == RIG_MODEL_ICR6) +#define RIG_IS_ICR7000 (STATE(rig)->rig_model == RIG_MODEL_ICR7000) +#define RIG_IS_ICR71 (STATE(rig)->rig_model == RIG_MODEL_ICR71) +#define RIG_IS_ICR7100 (STATE(rig)->rig_model == RIG_MODEL_ICR7100) +#define RIG_IS_ICR72 (STATE(rig)->rig_model == RIG_MODEL_ICR72) +#define RIG_IS_ICR75 (STATE(rig)->rig_model == RIG_MODEL_ICR75) +#define RIG_IS_ICR8500 (STATE(rig)->rig_model == RIG_MODEL_ICR8500) +#define RIG_IS_ICR8600 (STATE(rig)->rig_model == RIG_MODEL_ICR8600) +#define RIG_IS_ICR9000 (STATE(rig)->rig_model == RIG_MODEL_ICR9000) +#define RIG_IS_ICR9500 (STATE(rig)->rig_model == RIG_MODEL_ICR9500) +#define RIG_IS_ICRX7 (STATE(rig)->rig_model == RIG_MODEL_ICRX7) +#define RIG_IS_ID5100 (STATE(rig)->rig_model == RIG_MODEL_ID5100) +#define RIG_IS_OMNIVIP (STATE(rig)->rig_model == RIG_MODEL_OMNIVIP) +#define RIG_IS_OS456 (STATE(rig)->rig_model == RIG_MODEL_OS456) +#define RIG_IS_X5105 (STATE(rig)->rig_model == RIG_MODEL_X5105) +#define RIG_IS_X6100 (STATE(rig)->rig_model == RIG_MODEL_X6100) #endif /* _ICOM_H */