From 53b01d829ed7ebaf1742353117db1646051a9330 Mon Sep 17 00:00:00 2001
From: George Baltz N3GB <GeoBaltz@gmail.com>
Date: Sun, 10 Mar 2024 15:16:32 -0400
Subject: [PATCH] Start converting rigs/* to use pointers to state

---
 rigs/adat/adat.c         | 74 ++++++++++++++++++++--------------------
 rigs/anytone/anytone.c   | 16 ++++-----
 rigs/aor/aor.c           | 20 +++++------
 rigs/aor/ar3030.c        | 29 ++++++++--------
 rigs/aor/ar7030p.c       | 32 +++++++++--------
 rigs/aor/ar7030p_utils.c | 16 +++++----
 rigs/aor/sr2200.c        |  4 +--
 rigs/barrett/4050.c      |  2 +-
 rigs/barrett/950.c       |  6 ++--
 rigs/barrett/barrett.c   | 26 +++++++-------
 rigs/codan/codan.c       | 16 ++++-----
 11 files changed, 122 insertions(+), 119 deletions(-)

diff --git a/rigs/adat/adat.c b/rigs/adat/adat.c
index b865af42f..ad08b58e4 100644
--- a/rigs/adat/adat.c
+++ b/rigs/adat/adat.c
@@ -1309,7 +1309,7 @@ int adat_priv_set_cmd(RIG *pRig, char *pcCmd, int nCmdKind)
     }
     else
     {
-        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
+        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) STATE(pRig)->priv;
 
         memset(pPriv->acCmd, 0, ADAT_PRIV_DATA_CMD_LENGTH + 1);
         snprintf(pPriv->acCmd, ADAT_PRIV_DATA_CMD_LENGTH + 1, "%s", pcCmd);
@@ -1348,7 +1348,7 @@ int adat_priv_set_result(RIG *pRig, char *pcResult)
     }
     else
     {
-        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
+        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) STATE(pRig)->priv;
 
         memset(pPriv->acResult, 0, ADAT_PRIV_DATA_RESULT_LENGTH + 1);
         snprintf(pPriv->acResult, ADAT_PRIV_DATA_RESULT_LENGTH + 1, "%s", pcResult);
@@ -1390,7 +1390,7 @@ int adat_priv_clear_result(RIG *pRig)
     }
     else
     {
-        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
+        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) STATE(pRig)->priv;
         memset(pPriv->acResult, 0, ADAT_PRIV_DATA_RESULT_LENGTH + 1);
     }
 
@@ -1426,7 +1426,7 @@ int adat_get_single_cmd_result(RIG *pRig)
     }
     else
     {
-        adat_priv_data_ptr   pPriv     = (adat_priv_data_ptr) pRig->state.priv;
+        adat_priv_data_ptr   pPriv     = (adat_priv_data_ptr) STATE(pRig)->priv;
 
         nRC = adat_send(pRig, pPriv->acCmd);
 
@@ -1561,7 +1561,7 @@ int adat_cmd_recover_from_error(RIG *pRig, int nError)
     }
     else
     {
-        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
+        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) STATE(pRig)->priv;
 
         // Recover from communication error
 
@@ -1617,7 +1617,7 @@ int adat_cmd_fn_get_callsign(RIG *pRig)
     }
     else
     {
-        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
+        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) STATE(pRig)->priv;
 
         nRC = adat_priv_set_cmd(pRig,
                                 ADAT_CMD_DEF_STRING_GET_CALLSIGN,
@@ -1671,7 +1671,7 @@ int adat_cmd_fn_get_serial_nr(RIG *pRig)
     }
     else
     {
-        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
+        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) STATE(pRig)->priv;
 
         nRC = adat_priv_set_cmd(pRig,
                                 ADAT_CMD_DEF_STRING_GET_SERIAL_NR,
@@ -1725,7 +1725,7 @@ int adat_cmd_fn_get_fw_version(RIG *pRig)
     }
     else
     {
-        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
+        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) STATE(pRig)->priv;
 
         nRC = adat_priv_set_cmd(pRig,
                                 ADAT_CMD_DEF_STRING_GET_FW_VERSION,
@@ -1780,7 +1780,7 @@ int adat_cmd_fn_get_hw_version(RIG *pRig)
     }
     else
     {
-        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
+        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) STATE(pRig)->priv;
 
         nRC = adat_priv_set_cmd(pRig,
                                 ADAT_CMD_DEF_STRING_GET_HW_VERSION,
@@ -1834,7 +1834,7 @@ int adat_cmd_fn_get_gui_fw_version(RIG *pRig)
     }
     else
     {
-        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
+        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) STATE(pRig)->priv;
 
         nRC = adat_priv_set_cmd(pRig,
                                 ADAT_CMD_DEF_STRING_GET_GUI_FW_VERSION,
@@ -1889,7 +1889,7 @@ int adat_cmd_fn_get_id_code(RIG *pRig)
     }
     else
     {
-        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
+        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) STATE(pRig)->priv;
 
         nRC = adat_priv_set_cmd(pRig,
                                 ADAT_CMD_DEF_STRING_GET_ID_CODE,
@@ -1943,7 +1943,7 @@ int adat_cmd_fn_get_options(RIG *pRig)
     }
     else
     {
-        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
+        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) STATE(pRig)->priv;
 
         nRC = adat_priv_set_cmd(pRig,
                                 ADAT_CMD_DEF_STRING_GET_OPTIONS,
@@ -1997,7 +1997,7 @@ int adat_cmd_fn_get_mode(RIG *pRig)
     }
     else
     {
-        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
+        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) STATE(pRig)->priv;
 
         nRC = adat_priv_set_cmd(pRig,
                                 ADAT_CMD_DEF_STRING_GET_MODE,
@@ -2047,7 +2047,7 @@ int adat_cmd_fn_set_mode(RIG *pRig)
     }
     else
     {
-        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
+        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) STATE(pRig)->priv;
 
         // Translate Mode from RIG Mode Nr to ADAT Mode Nr
 
@@ -2109,7 +2109,7 @@ int adat_cmd_fn_get_freq(RIG *pRig)
     }
     else
     {
-        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
+        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) STATE(pRig)->priv;
 
         nRC = adat_priv_set_cmd(pRig,
                                 ADAT_CMD_DEF_STRING_GET_FREQ,
@@ -2171,7 +2171,7 @@ int adat_cmd_fn_set_freq(RIG *pRig)
     else
     {
         // cppcheck-suppress constVariablePointer
-        const adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
+        const adat_priv_data_ptr pPriv = (adat_priv_data_ptr) STATE(pRig)->priv;
         char acBuf[ ADAT_BUFSZ + 1 ];
 
         // Get frequency of selected VFO
@@ -2227,7 +2227,7 @@ int adat_cmd_fn_set_vfo(RIG *pRig)
     else
     {
         // cppcheck-suppress constVariablePointer
-        const adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
+        const adat_priv_data_ptr pPriv = (adat_priv_data_ptr) STATE(pRig)->priv;
         char acBuf[ ADAT_BUFSZ + 1 ];
 
         // Switch on VFO
@@ -2294,7 +2294,7 @@ int adat_cmd_fn_get_ptt(RIG *pRig)
     }
     else
     {
-        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
+        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) STATE(pRig)->priv;
 
         nRC = adat_priv_set_cmd(pRig,
                                 ADAT_CMD_DEF_STRING_GET_PTT,
@@ -2349,7 +2349,7 @@ int adat_cmd_fn_set_ptt(RIG *pRig)
     }
     else
     {
-        adat_priv_data_ptr  pPriv    = (adat_priv_data_ptr) pRig->state.priv;
+        adat_priv_data_ptr  pPriv    = (adat_priv_data_ptr) STATE(pRig)->priv;
         char *pcPTTStr = NULL;
 
         // Switch PTT
@@ -2430,7 +2430,7 @@ int adat_transaction(RIG                *pRig,
     {
         int nI    = 0;
         int nFini = 0;  // = 1 -> Stop executing commands
-        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
+        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) STATE(pRig)->priv;
 
         rig_debug(RIG_DEBUG_TRACE,
                   "*** ADAT: %d %s (%s:%d): Nr of commands = %d\n",
@@ -2552,7 +2552,7 @@ int adat_init(RIG *pRig)
         // Set Rig Priv data
 
         memset(&gsADATPrivData, 0, sizeof(adat_priv_data_t));
-        pRig->state.priv = &gsADATPrivData;
+        STATE(pRig)->priv = &gsADATPrivData;
     }
 
     // Done !
@@ -2586,7 +2586,7 @@ int adat_cleanup(RIG *pRig)
     }
     else
     {
-        pRig->state.priv = NULL;
+        STATE(pRig)->priv = NULL;
     }
 
     rig_debug(RIG_DEBUG_TRACE,
@@ -2691,7 +2691,7 @@ const char *adat_get_info(RIG *pRig)
         if (nRC == RIG_OK)
         {
             // cppcheck-suppress constVariablePointer
-            const adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
+            const adat_priv_data_ptr pPriv = (adat_priv_data_ptr) STATE(pRig)->priv;
 
             snprintf(acBuf, 2048,
                      "ADAT ADT-200A, Callsign: %s, S/N: %s, ID Code: %s, Options: %s, FW: %s, GUI FW: %s, HW: %s",
@@ -2736,7 +2736,7 @@ int adat_set_freq(RIG *pRig, vfo_t vfo, freq_t freq)
     }
     else
     {
-        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
+        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) STATE(pRig)->priv;
 
         pPriv->nFreq = freq;
 
@@ -2775,7 +2775,7 @@ int adat_get_freq(RIG *pRig, vfo_t vfo, freq_t *freq)
     else
     {
         // cppcheck-suppress constVariablePointer
-        const adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
+        const adat_priv_data_ptr pPriv = (adat_priv_data_ptr) STATE(pRig)->priv;
 
         nRC = adat_transaction(pRig, &adat_cmd_list_get_freq);
 
@@ -2813,7 +2813,7 @@ int adat_set_level(RIG *pRig, vfo_t vfo, setting_t level, value_t val)
     }
     else
     {
-        //adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
+        //adat_priv_data_ptr pPriv = (adat_priv_data_ptr) STATE(pRig)->priv;
 
     }
 
@@ -2848,7 +2848,7 @@ int adat_get_level(RIG *pRig, vfo_t vfo, setting_t level, value_t *val)
     }
     else
     {
-        //adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
+        //adat_priv_data_ptr pPriv = (adat_priv_data_ptr) STATE(pRig)->priv;
 
     }
 
@@ -2883,7 +2883,7 @@ int adat_set_mode(RIG *pRig, vfo_t vfo, rmode_t mode, pbwidth_t width)
     }
     else
     {
-        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
+        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) STATE(pRig)->priv;
 
         pPriv->nRIGMode    = mode;
         adat_vfo_rnr2anr(vfo, &(pPriv->nCurrentVFO));
@@ -2933,7 +2933,7 @@ int adat_get_mode(RIG *pRig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
     else
     {
         // cppcheck-suppress constVariablePointer
-        const adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
+        const adat_priv_data_ptr pPriv = (adat_priv_data_ptr) STATE(pRig)->priv;
 
         nRC =  adat_transaction(pRig, &adat_cmd_list_get_mode);
 
@@ -2976,7 +2976,7 @@ int adat_get_vfo(RIG *pRig, vfo_t *vfo)
     else
     {
         // cppcheck-suppress constVariablePointer
-        const adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
+        const adat_priv_data_ptr pPriv = (adat_priv_data_ptr) STATE(pRig)->priv;
 
         nRC = adat_transaction(pRig, &adat_cmd_list_get_vfo);
 
@@ -3014,7 +3014,7 @@ int adat_set_vfo(RIG *pRig, vfo_t vfo)
     }
     else
     {
-        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
+        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) STATE(pRig)->priv;
 
         nRC = adat_vfo_rnr2anr(vfo, &(pPriv->nCurrentVFO));
 
@@ -3056,7 +3056,7 @@ int adat_get_ptt(RIG *pRig, vfo_t vfo, ptt_t *ptt)
     else
     {
         // cppcheck-suppress constVariablePointer
-        const adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
+        const adat_priv_data_ptr pPriv = (adat_priv_data_ptr) STATE(pRig)->priv;
 
         nRC = adat_transaction(pRig, &adat_cmd_list_get_ptt);
 
@@ -3094,7 +3094,7 @@ int adat_set_ptt(RIG *pRig, vfo_t vfo, ptt_t ptt)
     }
     else
     {
-        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
+        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) STATE(pRig)->priv;
 
         switch (ptt)
         {
@@ -3270,7 +3270,7 @@ int adat_set_conf(RIG *pRig, hamlib_token_t token, const char *val)
     }
     else
     {
-        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
+        adat_priv_data_ptr pPriv = (adat_priv_data_ptr) STATE(pRig)->priv;
 
         switch (token)
         {
@@ -3317,7 +3317,7 @@ int adat_get_conf(RIG *pRig, hamlib_token_t token, char *val)
     else
     {
         // cppcheck-suppress constVariablePointer
-        const adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
+        const adat_priv_data_ptr pPriv = (adat_priv_data_ptr) STATE(pRig)->priv;
 
         switch (token)
         {
@@ -3369,7 +3369,7 @@ int adat_reset(RIG *pRig, reset_t reset)
     }
     else
     {
-        //adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
+        //adat_priv_data_ptr pPriv = (adat_priv_data_ptr) STATE(pRig)->priv;
 
     }
 
@@ -3404,7 +3404,7 @@ int adat_handle_event(RIG *pRig)
     }
     else
     {
-        //adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
+        //adat_priv_data_ptr pPriv = (adat_priv_data_ptr) STATE(pRig)->priv;
         char               acBuf[ ADAT_RESPSZ + 1 ];
 
         memset(acBuf, 0, ADAT_RESPSZ + 1);
diff --git a/rigs/anytone/anytone.c b/rigs/anytone/anytone.c
index 8c4ca1fdf..ddcfcdf5e 100644
--- a/rigs/anytone/anytone.c
+++ b/rigs/anytone/anytone.c
@@ -98,7 +98,7 @@ void *anytone_thread(void *vrig)
 {
     RIG *rig = (RIG *)vrig;
     hamlib_port_t *rp = RIGPORT(rig);
-    anytone_priv_data_t *p = rig->state.priv;
+    anytone_priv_data_t *p = STATE(rig)->priv;
     rig_debug(RIG_DEBUG_TRACE, "%s: anytone_thread started\n", __func__);
     p->runflag = 1;
 
@@ -182,7 +182,7 @@ int anytone_transaction(RIG *rig, unsigned char *cmd, int cmd_len,
                         unsigned char *reply, int reply_len, int expected_len)
 {
     int retval   = RIG_OK;
-    //anytone_priv_data_t *p = rig->state.priv;
+    //anytone_priv_data_t *p = STATE(rig)->priv;
 
     ENTERFUNC;
 
@@ -221,7 +221,7 @@ int anytone_init(RIG *rig)
         }
         else
         {
-            rig->state.priv = p;
+            STATE(rig)->priv = p;
             p->vfo_curr = RIG_VFO_NONE;
 #ifdef HAVE_PTHREAD
             pthread_mutex_init(&p->mutex, NULL);
@@ -246,8 +246,8 @@ int anytone_cleanup(RIG *rig)
 
     ENTERFUNC;
 
-    free(rig->state.priv);
-    rig->state.priv = NULL;
+    free(STATE(rig)->priv);
+    STATE(rig)->priv = NULL;
 
     RETURNFUNC(retval);
 }
@@ -312,7 +312,7 @@ int anytone_get_vfo(RIG *rig, vfo_t *vfo)
 
     ENTERFUNC;
 
-    const anytone_priv_data_ptr p = (anytone_priv_data_ptr) rig->state.priv;
+    const anytone_priv_data_ptr p = (anytone_priv_data_ptr) STATE(rig)->priv;
     unsigned char reply[512];
     unsigned char cmd[] = { 0x2b, 0x41, 0x44, 0x41, 0x54, 0x41, 0x3a, 0x30, 0x30, 0x2c, 0x30, 0x30, 0x36, 0x0d, 0x0a, 0x04, 0x05, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x0a };
     anytone_transaction(rig, cmd, sizeof(cmd), reply, sizeof(reply), 114);
@@ -348,7 +348,7 @@ int anytone_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt)
 
     ENTERFUNC;
 
-    anytone_priv_data_t *p = rig->state.priv;
+    anytone_priv_data_t *p = STATE(rig)->priv;
     *ptt = p->ptt;
 
     RETURNFUNC(retval);
@@ -373,7 +373,7 @@ int anytone_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
 
     MUTEX_LOCK(p->mutex);
     anytone_transaction(rig, pttcmd, sizeof(ptton), NULL, 0, 0);
-    anytone_priv_data_t *p = rig->state.priv;
+    anytone_priv_data_t *p = STATE(rig)->priv;
     p->ptt = ptt;
     MUTEX_UNLOCK(p->mutex);
 
diff --git a/rigs/aor/aor.c b/rigs/aor/aor.c
index 9839cd6ce..fd8147791 100644
--- a/rigs/aor/aor.c
+++ b/rigs/aor/aor.c
@@ -58,7 +58,7 @@
 
 /*
  * aor_transaction
- * We assume that rig!=NULL, rig->state!= NULL, data!=NULL, data_len!=NULL
+ * We assume that rig!=NULL, STATE(rig)!= NULL, data!=NULL, data_len!=NULL
  * Otherwise, you'll get a nice seg fault. You've been warned!
  * return value: RIG_OK if everything's fine, negative value otherwise
  * TODO: error case handling
@@ -605,7 +605,7 @@ int aor_set_ts(RIG *rig, vfo_t vfo, shortfreq_t ts)
 
 /*
  * aor_set_level
- * Assumes rig!=NULL, rig->state.priv!=NULL
+ * Assumes rig!=NULL, STATE(rig)->priv!=NULL
  */
 int aor_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
 {
@@ -613,7 +613,7 @@ int aor_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
     char lvlbuf[BUFSZ];
     int agc;
 
-    rs = &rig->state;
+    rs = STATE(rig);
 
 
     switch (level)
@@ -670,16 +670,14 @@ int aor_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
 
 /*
  * aor_get_level
- * Assumes rig!=NULL, rig->state.priv!=NULL, val!=NULL
+ * Assumes rig!=NULL, STATE(rig)->priv!=NULL, val!=NULL
  */
 int aor_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 {
-    struct rig_state *rs;
+    struct rig_state *rs = STATE(rig);
     char lvlbuf[BUFSZ], ackbuf[BUFSZ];
     int ack_len, retval;
 
-    rs = &rig->state;
-
     switch (level)
     {
     case RIG_LEVEL_RAWSTR:
@@ -820,7 +818,7 @@ int aor_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 
 /*
  * aor_get_dcd
- * Assumes rig!=NULL, rig->state.priv!=NULL, val!=NULL
+ * Assumes rig!=NULL, STATE(rig)->priv!=NULL, val!=NULL
  */
 int aor_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd)
 {
@@ -847,7 +845,7 @@ int aor_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd)
 
 /*
  * aor_set_powerstat
- * Assumes rig!=NULL, rig->state.priv!=NULL
+ * Assumes rig!=NULL, STATE(rig)->priv!=NULL
  */
 int aor_set_powerstat(RIG *rig, powerstat_t status)
 {
@@ -891,7 +889,7 @@ int aor_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op)
 
 /*
  * aor_scan, scan operation
- * Assumes rig!=NULL, rig->state.priv!=NULL
+ * Assumes rig!=NULL, STATE(rig)->priv!=NULL
  */
 int aor_scan(RIG *rig, vfo_t vfo, scan_t scan, int ch)
 {
@@ -1344,7 +1342,7 @@ int aor_get_chan_all_cb(RIG *rig, vfo_t vfo, chan_cb_t chan_cb, rig_ptr_t arg)
 {
     const struct aor_priv_caps *priv = (struct aor_priv_caps *)rig->caps->priv;
     int i, j, retval;
-    chan_t *chan_list = rig->state.chan_list;
+    chan_t *chan_list = STATE(rig)->chan_list;
     channel_t *chan;
     int chan_count;
     char aorcmd[BUFSZ];
diff --git a/rigs/aor/ar3030.c b/rigs/aor/ar3030.c
index 6d56f0983..ab8c9bdd2 100644
--- a/rigs/aor/ar3030.c
+++ b/rigs/aor/ar3030.c
@@ -277,15 +277,16 @@ static int ar3030_transaction(RIG *rig, const char *cmd, int cmd_len,
 int ar3030_init(RIG *rig)
 {
     struct ar3030_priv_data *priv;
+    struct rig_state *rs = STATE(rig);
 
-    rig->state.priv = calloc(1, sizeof(struct ar3030_priv_data));
+    rs->priv = calloc(1, sizeof(struct ar3030_priv_data));
 
-    if (!rig->state.priv)
+    if (!rs->priv)
     {
         return -RIG_ENOMEM;
     }
 
-    priv = rig->state.priv;
+    priv = rs->priv;
 
     priv->curr_ch = 99; /* huh! FIXME: get_mem in open() ? */
     priv->curr_vfo = RIG_VFO_A;
@@ -295,7 +296,7 @@ int ar3030_init(RIG *rig)
 
 int ar3030_cleanup(RIG *rig)
 {
-    struct ar3030_priv_data *priv = rig->state.priv;
+    struct ar3030_priv_data *priv = STATE(rig)->priv;
 
     free(priv);
 
@@ -318,7 +319,7 @@ int ar3030_close(RIG *rig)
 
 int ar3030_set_vfo(RIG *rig, vfo_t vfo)
 {
-    struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv;
+    struct ar3030_priv_data *priv = (struct ar3030_priv_data *)STATE(rig)->priv;
     char *cmd = "";
     int retval;
 
@@ -353,7 +354,7 @@ int ar3030_set_vfo(RIG *rig, vfo_t vfo)
 int ar3030_get_vfo(RIG *rig, vfo_t *vfo)
 {
     const struct ar3030_priv_data *priv = (struct ar3030_priv_data *)
-                                          rig->state.priv;
+                                          STATE(rig)->priv;
 
     *vfo = priv->curr_vfo;
 
@@ -367,7 +368,7 @@ int ar3030_get_vfo(RIG *rig, vfo_t *vfo)
  */
 int ar3030_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
 {
-    struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv;
+    struct ar3030_priv_data *priv = (struct ar3030_priv_data *)STATE(rig)->priv;
     char freqbuf[BUFSZ];
     int retval;
 
@@ -391,7 +392,7 @@ int ar3030_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
  */
 int ar3030_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
 {
-    struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv;
+    struct ar3030_priv_data *priv = (struct ar3030_priv_data *)STATE(rig)->priv;
     char *rfp;
     int freq_len, retval;
     char freqbuf[BUFSZ];
@@ -491,7 +492,7 @@ int ar3030_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
  */
 int ar3030_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
 {
-    struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv;
+    struct ar3030_priv_data *priv = (struct ar3030_priv_data *)STATE(rig)->priv;
     int buf_len, retval;
     char buf[BUFSZ];
 
@@ -553,7 +554,7 @@ int ar3030_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
 
 int ar3030_set_mem(RIG *rig, vfo_t vfo, int ch)
 {
-    struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv;
+    struct ar3030_priv_data *priv = (struct ar3030_priv_data *)STATE(rig)->priv;
     int retval = RIG_OK;
 
     if (priv->curr_vfo == RIG_VFO_MEM)
@@ -573,7 +574,7 @@ int ar3030_set_mem(RIG *rig, vfo_t vfo, int ch)
 
 int ar3030_get_mem(RIG *rig, vfo_t vfo, int *ch)
 {
-    struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv;
+    struct ar3030_priv_data *priv = (struct ar3030_priv_data *)STATE(rig)->priv;
     char infobuf[BUFSZ];
     int info_len, retval;
 
@@ -646,7 +647,7 @@ int ar3030_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
 
 int ar3030_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 {
-    struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv;
+    struct ar3030_priv_data *priv = (struct ar3030_priv_data *)STATE(rig)->priv;
     int info_len, retval;
     char infobuf[BUFSZ], *p;
 
@@ -717,7 +718,7 @@ int ar3030_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 
 int ar3030_get_channel(RIG *rig, vfo_t vfo, channel_t *chan, int read_only)
 {
-    struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv;
+    struct ar3030_priv_data *priv = (struct ar3030_priv_data *)STATE(rig)->priv;
     char cmdbuf[BUFSZ], infobuf[BUFSZ];
     int info_len, retval;
 
@@ -814,7 +815,7 @@ int ar3030_get_channel(RIG *rig, vfo_t vfo, channel_t *chan, int read_only)
 
 int ar3030_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op)
 {
-    struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv;
+    struct ar3030_priv_data *priv = (struct ar3030_priv_data *)STATE(rig)->priv;
     char buf[16];
     int retval;
 
diff --git a/rigs/aor/ar7030p.c b/rigs/aor/ar7030p.c
index 19874ad1d..2d57b0f17 100644
--- a/rigs/aor/ar7030p.c
+++ b/rigs/aor/ar7030p.c
@@ -264,7 +264,7 @@ static int ar7030p_init(RIG *rig)
     {
         int i;
 
-        rig->state.priv = (void *) priv;
+        STATE(rig)->priv = (void *) priv;
 
         RIGPORT(rig)->type.rig = RIG_PORT_SERIAL;
 
@@ -327,7 +327,7 @@ static int ar7030p_init(RIG *rig)
 
 static int ar7030p_cleanup(RIG *rig)
 {
-    struct ar7030p_priv_data *priv = (struct ar7030p_priv_data *) rig->state.priv;
+    struct ar7030p_priv_data *priv = (struct ar7030p_priv_data *) STATE(rig)->priv;
     int rc = RIG_OK;
     int i;
 
@@ -345,9 +345,9 @@ static int ar7030p_cleanup(RIG *rig)
 
     free(priv->ext_parms);
 
-    free(rig->state.priv);
+    free(STATE(rig)->priv);
 
-    rig->state.priv = NULL;
+    STATE(rig)->priv = NULL;
 
     return (rc);
 }
@@ -363,8 +363,10 @@ static int ar7030p_open(RIG *rig)
 {
     int rc = RIG_OK;
     unsigned char v;
+    struct rig_state *rs;
 
     assert(NULL != rig);
+    rs = STATE(rig);
 
     rc = lockRx(rig, LOCK_1);
 
@@ -373,9 +375,9 @@ static int ar7030p_open(RIG *rig)
         int i;
 
         /* Load calibration table */
-        rig->state.str_cal.size = rig->caps->str_cal.size;
+        rs->str_cal.size = rig->caps->str_cal.size;
 
-        for (i = 0; i < rig->state.str_cal.size; i++)
+        for (i = 0; i < rs->str_cal.size; i++)
         {
             rc = readByte(rig, EEPROM1, SM_CAL + i, &v);
 
@@ -384,12 +386,12 @@ static int ar7030p_open(RIG *rig)
                 break;
             }
 
-            rig->state.str_cal.table[ i ].val = rig->caps->str_cal.table[ i ].val;
-            rig->state.str_cal.table[ i ].raw = (int) v;
+            rs->str_cal.table[ i ].val = rig->caps->str_cal.table[ i ].val;
+            rs->str_cal.table[ i ].raw = (int) v;
 
             rig_debug(RIG_DEBUG_VERBOSE, "%s: index %d, val %d, raw %d\n",
-                      __func__, i, rig->state.str_cal.table[ i ].val,
-                      rig->state.str_cal.table[ i ].raw);
+                      __func__, i, rs->str_cal.table[ i ].val,
+                      rs->str_cal.table[ i ].raw);
         }
 
         if (RIG_OK == rc)
@@ -1220,7 +1222,7 @@ static int ar7030p_get_level(RIG *rig, vfo_t vfo, setting_t level,
 static int ar7030p_set_vfo(RIG *rig, vfo_t vfo)
 {
     int rc = RIG_OK;
-    struct ar7030p_priv_data *priv = (struct ar7030p_priv_data *) rig->state.priv;
+    struct ar7030p_priv_data *priv = (struct ar7030p_priv_data *) STATE(rig)->priv;
 
     switch (vfo)
     {
@@ -1265,7 +1267,7 @@ static int ar7030p_get_vfo(RIG *rig, vfo_t *vfo)
 {
     int rc = RIG_OK;
     struct ar7030p_priv_data const *priv = (struct ar7030p_priv_data *)
-                                           rig->state.priv;
+                                           STATE(rig)->priv;
 
     assert(NULL != vfo);
 
@@ -1329,7 +1331,7 @@ static int ar7030p_set_mem(RIG *rig, vfo_t vfo, int ch)
 {
     int rc = RIG_OK;
 
-    struct ar7030p_priv_data *priv = (struct ar7030p_priv_data *) rig->state.priv;
+    struct ar7030p_priv_data *priv = (struct ar7030p_priv_data *) STATE(rig)->priv;
 
     if (RIG_VFO_MEM == priv->curr_vfo)
     {
@@ -1350,7 +1352,7 @@ static int ar7030p_get_mem(RIG *rig, vfo_t vfo, int *ch)
     int rc = RIG_OK;
 
     struct ar7030p_priv_data const *priv = (struct ar7030p_priv_data *)
-                                           rig->state.priv;
+                                           STATE(rig)->priv;
     const channel_t *curr = priv->curr;
 
     assert(NULL != ch);
@@ -1651,7 +1653,7 @@ static int ar7030p_get_channel(RIG *rig, vfo_t vfo, channel_t *chan,
     unsigned char *p = NULL;
     int ch;
     const struct ar7030p_priv_data *priv = (struct ar7030p_priv_data *)
-                                           rig->state.priv;
+                                           STATE(rig)->priv;
     const channel_t *curr = priv->curr;
 
     assert(NULL != chan);
diff --git a/rigs/aor/ar7030p_utils.c b/rigs/aor/ar7030p_utils.c
index 2f15a6a50..adeef7b8b 100644
--- a/rigs/aor/ar7030p_utils.c
+++ b/rigs/aor/ar7030p_utils.c
@@ -987,27 +987,29 @@ int getCalLevel(RIG *rig, unsigned char rawAgc, int *dbm)
     int raw = (int) rawAgc;
     int step;
     unsigned char v;
+    struct rig_state *rs;
 
     assert(NULL != rig);
     assert(NULL != dbm);
+    rs = STATE(rig);
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s: raw AGC %03d\n", __func__, rawAgc);
 
-    for (i = 0; i < rig->state.str_cal.size; i++)
+    for (i = 0; i < rs->str_cal.size; i++)
     {
-        *dbm = rig->state.str_cal.table[ i ].val;
+        *dbm = rs->str_cal.table[ i ].val;
 
         rig_debug(RIG_DEBUG_VERBOSE, "%s: got cal table[ %d ] dBm value %d\n", __func__,
                   i, *dbm);
 
         /* if the remaining difference in the raw value is negative */
-        if (0 > (raw - rig->state.str_cal.table[ i ].raw))
+        if (0 > (raw - rs->str_cal.table[ i ].raw))
         {
             /* calculate step size */
             if (0 < i)
             {
-                step = rig->state.str_cal.table[ i ].val -
-                       rig->state.str_cal.table[ i - 1 ].val;
+                step = rs->str_cal.table[ i ].val -
+                       rs->str_cal.table[ i - 1 ].val;
             }
             else
             {
@@ -1018,7 +1020,7 @@ int getCalLevel(RIG *rig, unsigned char rawAgc, int *dbm)
 
             /* interpolate the final value */
             *dbm -= step; /* HACK - table seems to be off by one index */
-            *dbm += (int)(((double) raw / (double) rig->state.str_cal.table[ i ].raw) *
+            *dbm += (int)(((double) raw / (double) rs->str_cal.table[ i ].raw) *
                           (double) step);
 
             rig_debug(RIG_DEBUG_VERBOSE, "%s: interpolated dBm value %d\n", __func__, *dbm);
@@ -1029,7 +1031,7 @@ int getCalLevel(RIG *rig, unsigned char rawAgc, int *dbm)
         else
         {
             /* calculate the remaining raw value */
-            raw = raw - rig->state.str_cal.table[ i ].raw;
+            raw = raw - rs->str_cal.table[ i ].raw;
 
             rig_debug(RIG_DEBUG_VERBOSE, "%s: residual raw value %d\n", __func__, raw);
         }
diff --git a/rigs/aor/sr2200.c b/rigs/aor/sr2200.c
index 244308878..0b092f71f 100644
--- a/rigs/aor/sr2200.c
+++ b/rigs/aor/sr2200.c
@@ -603,7 +603,7 @@ int sr2200_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
     int agc;
     unsigned att = 0;
 
-    rs = &rig->state;
+    rs = STATE(rig);
 
     switch (level)
     {
@@ -685,7 +685,7 @@ int sr2200_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
     char lvlbuf[BUFSZ], ackbuf[BUFSZ];
     int ack_len, retval;
 
-    rs = &rig->state;
+    rs = STATE(rig);
 
     switch (level)
     {
diff --git a/rigs/barrett/4050.c b/rigs/barrett/4050.c
index 6bd44ef56..a6664a16e 100644
--- a/rigs/barrett/4050.c
+++ b/rigs/barrett/4050.c
@@ -66,7 +66,7 @@ static int barrett4050_open(RIG *rig)
 {
     int retval;
     char *response;
-    struct barrett_priv_data *priv = rig->state.priv;
+    struct barrett_priv_data *priv = STATE(rig)->priv;
     ENTERFUNC;
     barrett4050_get_info(rig);
     retval = barrett_transaction(rig, "IDC9999", 0, &response);
diff --git a/rigs/barrett/950.c b/rigs/barrett/950.c
index 1c6e40045..8ac8fc769 100644
--- a/rigs/barrett/950.c
+++ b/rigs/barrett/950.c
@@ -137,7 +137,7 @@ struct rig_caps barrett950_caps =
 
 /*
  * barrett950_set_freq
- * assumes rig!=NULL, rig->state.priv!=NULL
+ * assumes rig!=NULL, STATE(rig)->priv!=NULL
  */
 int barrett950_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
 {
@@ -148,8 +148,8 @@ int barrett950_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
     freq_t freq_rx, freq_tx;
     freq_t freq_MHz;
     char *response = NULL;
-    const struct barrett_priv_data *priv = rig->state.priv;
-    //struct barrett_priv_data *priv = rig->state.priv;
+    const struct barrett_priv_data *priv = STATE(rig)->priv;
+    //struct barrett_priv_data *priv = STATE(rig)->priv;
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s: vfo=%s freq=%.0f\n", __func__,
               rig_strvfo(vfo), freq);
diff --git a/rigs/barrett/barrett.c b/rigs/barrett/barrett.c
index b407322ff..0dad6cd72 100644
--- a/rigs/barrett/barrett.c
+++ b/rigs/barrett/barrett.c
@@ -58,7 +58,7 @@ DECLARE_INITRIG_BACKEND(barrett)
 int barrett_transaction2(RIG *rig, char *cmd, int expected, char **result)
 {
     char cmd_buf[MAXCMDLEN];
-    struct barrett_priv_data *priv = rig->state.priv;
+    struct barrett_priv_data *priv = STATE(rig)->priv;
     int retval;
 
     SNPRINTF(cmd_buf, sizeof(cmd_buf), "%c%s%s", 0x0a, cmd, EOM);
@@ -80,7 +80,7 @@ int barrett_transaction(RIG *rig, char *cmd, int expected, char **result)
     char xon;
     char xoff;
     hamlib_port_t *rp = RIGPORT(rig);
-    struct barrett_priv_data *priv = rig->state.priv;
+    struct barrett_priv_data *priv = STATE(rig)->priv;
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s: cmd=%s\n", __func__, cmd);
 
@@ -200,10 +200,10 @@ int barrett_init(RIG *rig)
     rig_debug(RIG_DEBUG_VERBOSE, "%s version %s\n", __func__,
               rig->caps->version);
     // cppcheck claims leak here but it's freed in cleanup
-    rig->state.priv = (struct barrett_priv_data *)calloc(1,
+    STATE(rig)->priv = (struct barrett_priv_data *)calloc(1,
                       sizeof(struct barrett_priv_data));
 
-    if (!rig->state.priv)
+    if (!STATE(rig)->priv)
     {
         return -RIG_ENOMEM;
     }
@@ -227,12 +227,12 @@ int barrett_cleanup(RIG *rig)
         return -RIG_EINVAL;
     }
 
-    if (rig->state.priv)
+    if (STATE(rig)->priv)
     {
-        free(rig->state.priv);
+        free(STATE(rig)->priv);
     }
 
-    rig->state.priv = NULL;
+    STATE(rig)->priv = NULL;
 
     return RIG_OK;
 }
@@ -240,7 +240,7 @@ int barrett_cleanup(RIG *rig)
 
 /*
  * barrett_get_freq
- * Assumes rig!=NULL, rig->state.priv!=NULL, freq!=NULL
+ * Assumes rig!=NULL, STATE(rig)->priv!=NULL, freq!=NULL
  */
 int barrett_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
 {
@@ -280,13 +280,13 @@ int barrett_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
 // TC command does not work on 4050 -- not implemented as of 2022-01-12
 /*
  * barrett_set_freq
- * assumes rig!=NULL, rig->state.priv!=NULL
+ * assumes rig!=NULL, STATE(rig)->priv!=NULL
  */
 int barrett_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
 {
     char cmd_buf[MAXCMDLEN];
     int retval;
-    const struct barrett_priv_data *priv = rig->state.priv;
+    const struct barrett_priv_data *priv = STATE(rig)->priv;
     freq_t tfreq;
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s: vfo=%s freq=%.0f\n", __func__,
@@ -438,7 +438,7 @@ int barrett_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
     rmode_t tmode;
     pbwidth_t twidth;
 
-    //struct tt588_priv_data *priv = (struct tt588_priv_data *) rig->state.priv;
+    //struct tt588_priv_data *priv = (struct tt588_priv_data *) STATE(rig)->priv;
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s: vfo=%s mode=%s width=%d\n", __func__,
               rig_strvfo(vfo), rig_strrmode(mode), (int)width);
@@ -604,7 +604,7 @@ int barrett_set_split_vfo(RIG *rig, vfo_t rxvfo, split_t split, vfo_t txvfo)
 {
     struct barrett_priv_data *priv;
 
-    priv = rig->state.priv;
+    priv = STATE(rig)->priv;
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s called rxvfo=%s, txvfo=%s, split=%d\n",
               __func__, rig_strvfo(rxvfo), rig_strvfo(txvfo), split);
@@ -618,7 +618,7 @@ int barrett_get_split_vfo(RIG *rig, vfo_t rxvfo, split_t *split, vfo_t *txvfo)
 {
     struct barrett_priv_data *priv;
 
-    priv = rig->state.priv;
+    priv = STATE(rig)->priv;
 
     *split = priv->split;
     *txvfo = RIG_VFO_B; // constant
diff --git a/rigs/codan/codan.c b/rigs/codan/codan.c
index f1fe2b51a..692cb4695 100644
--- a/rigs/codan/codan.c
+++ b/rigs/codan/codan.c
@@ -47,7 +47,7 @@ int codan_transaction(RIG *rig, char *cmd, int expected, char **result)
     char cmd_buf[MAXCMDLEN];
     int retval;
     hamlib_port_t *rp = RIGPORT(rig);
-    struct codan_priv_data *priv = rig->state.priv;
+    struct codan_priv_data *priv = STATE(rig)->priv;
     //int retry = 3;
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s: cmd=%s\n", __func__, cmd);
@@ -137,10 +137,10 @@ int codan_init(RIG *rig)
     rig_debug(RIG_DEBUG_VERBOSE, "%s version %s\n", __func__,
               rig->caps->version);
     // cppcheck claims leak here but it's freed in cleanup
-    rig->state.priv = (struct codan_priv_data *)calloc(1,
+    STATE(rig)->priv = (struct codan_priv_data *)calloc(1,
                       sizeof(struct codan_priv_data));
 
-    if (!rig->state.priv)
+    if (!STATE(rig)->priv)
     {
         return -RIG_ENOMEM;
     }
@@ -184,12 +184,12 @@ int codan_cleanup(RIG *rig)
         return -RIG_EINVAL;
     }
 
-    if (rig->state.priv)
+    if (STATE(rig)->priv)
     {
-        free(rig->state.priv);
+        free(STATE(rig)->priv);
     }
 
-    rig->state.priv = NULL;
+    STATE(rig)->priv = NULL;
 
     return RIG_OK;
 }
@@ -286,7 +286,7 @@ int codan_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
 
 /*
  * codan_set_freq
- * assumes rig!=NULL, rig->state.priv!=NULL
+ * assumes rig!=NULL, STATE(rig)->priv!=NULL
  */
 int codan_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
 {
@@ -313,7 +313,7 @@ int codan_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
 
 /*
  * codan_get_freq
- * Assumes rig!=NULL, rig->state.priv!=NULL, freq!=NULL
+ * Assumes rig!=NULL, STATE(rig)->priv!=NULL, freq!=NULL
  */
 int codan_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
 {