From 03ad7a953f4a31ab4b5c78a8394d6a5d62604801 Mon Sep 17 00:00:00 2001
From: Michael Black W9MDB <mdblack98@yahoo.com>
Date: Fri, 11 Sep 2020 22:44:35 -0500
Subject: [PATCH] Update codeql

---
 rigs/icom/ic7300.c | 17 ++++++++++-------
 rigs/icom/icom.c   |  4 ++--
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/rigs/icom/ic7300.c b/rigs/icom/ic7300.c
index 985121e81..1cdcd0d17 100644
--- a/rigs/icom/ic7300.c
+++ b/rigs/icom/ic7300.c
@@ -62,16 +62,12 @@ struct cmdparams ic7300_extcmds[] =
     { {.s = RIG_PARM_BEEP}, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x00, 0x23}, CMD_DAT_BOL, 1 },
     { {.s = RIG_PARM_BACKLIGHT}, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x00, 0x81}, CMD_DAT_LVL, 2 },
     { {.s = RIG_PARM_TIME}, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x00, 0x95}, CMD_DAT_TIM, 2 },
-    { {.s = RIG_LEVEL_VOXDELAY}, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x01, 0x91}, CMD_DAT_INT, 1 },
     { {.s = RIG_PARM_NONE} }
 };
 
-struct cmdparams ic705_extcmds[] =
+struct cmdparams ic7300_extlevels[] =
 {
-    { {.s = RIG_PARM_BEEP}, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x00, 0x29}, CMD_DAT_BOL, 1 },
     { {.s = RIG_LEVEL_VOXDELAY}, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x03, 0x59}, CMD_DAT_INT, 1 },
-    { {.s = RIG_PARM_SCREENSAVER}, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x01, 0x38}, CMD_DAT_INT, 1 },
-    { {.s = RIG_PARM_NONE} }
 };
 
 /*
@@ -157,11 +153,15 @@ struct cmdparams ic9700_extcmds[] =
 {
     { {.s = RIG_PARM_BEEP}, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x00, 0x29}, CMD_DAT_BOL, 1 },
     { {.s = RIG_PARM_BACKLIGHT}, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x01, 0x52}, CMD_DAT_LVL, 2 },
-    { {.s = RIG_LEVEL_VOXDELAY}, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x03, 0x30}, CMD_DAT_INT, 1 },
     { {.s = RIG_PARM_SCREENSAVER}, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x01, 0x67}, CMD_DAT_INT, 1 },
     { {.s = RIG_PARM_NONE} }
 };
 
+struct cmdparams ic9700_extlevels[] =
+{
+    { {.s = RIG_LEVEL_VOXDELAY}, C_CTL_MEM, S_MEM_PARM, SC_MOD_RW, 2, {0x03, 0x30}, CMD_DAT_INT, 1 },
+};
+
 #define IC9700_STR_CAL { 7, \
     { \
         {   0, -54 }, \
@@ -233,6 +233,7 @@ static const struct icom_priv_caps IC7300_priv_caps =
         { .level = -1, .icom_level = 0 },
     },
     .extcmds = ic7300_extcmds,   /* Custom op parameters */
+    .extlevels = ic7300_extlevels, /* Custom parameters */
 };
 
 static const struct icom_priv_caps IC9700_priv_caps =
@@ -250,6 +251,7 @@ static const struct icom_priv_caps IC9700_priv_caps =
         { .level = -1, .icom_level = 0 },
     },
     .extcmds = ic9700_extcmds,   /* Custom op parameters */
+    .extlevels = ic9700_extlevels,   /* Custom op parameters */
 };
 
 static const struct icom_priv_caps IC705_priv_caps =
@@ -266,7 +268,8 @@ static const struct icom_priv_caps IC705_priv_caps =
         { .level = RIG_AGC_SLOW, .icom_level = 3 },
         { .level = -1, .icom_level = 0 },
     },
-    .extcmds = ic705_extcmds,   /* Custom op parameters */
+    .extcmds = ic7300_extcmds,     /* Custom parameters */
+    .extlevels = ic7300_extlevels, /* Custom parameters */
 };
 
 const struct rig_caps ic7300_caps =
diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 059310bc7..275f59da4 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -2340,7 +2340,7 @@ int icom_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
 
-    const struct cmdparams *cmd = priv_caps->extcmds;
+    const struct cmdparams *cmd = priv_caps->extlevels;
 
     for (i = 0; cmd && cmd[i].id.s != 0; i++)
     {
@@ -2697,7 +2697,7 @@ int icom_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
     rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
 
     const struct icom_priv_caps *priv = rig->caps->priv;
-    const struct cmdparams *cmd = priv->extcmds;
+    const struct cmdparams *cmd = priv->extlevels;
     int i;
 
     for (i = 0; cmd && cmd[i].id.s != 0; i++)