scpi-pps: fixed out-of-bounds array access...

[libsigrok.git] / src / hardware / scpi-pps / profiles.c

diff --git a/src/hardware/scpi-pps/profiles.c b/src/hardware/scpi-pps/profiles.c
index 9e664480ca7321ffc12977f2355a02dc9f05bcd6..6ae9168bb232b59e27c2d9e363c1ef80913b4ef5 100644 (file)
--- a/src/hardware/scpi-pps/profiles.c
+++ b/src/hardware/scpi-pps/profiles.c
@@ -483,10 +483,9 @@ static const struct scpi_command hp_6630a_cmd[] = {
        ALL_ZERO
 };
 
-static int hp_6630a_init_aquisition(const struct sr_dev_inst *sdi)
+static int hp_6630a_init_acquisition(const struct sr_dev_inst *sdi)
 {
        struct sr_scpi_dev_inst *scpi;
-       int ret;
 
        scpi = sdi->conn;
 
@@ -494,11 +493,7 @@ static int hp_6630a_init_aquisition(const struct sr_dev_inst *sdi)
         * Monitor CV (1), CC+ (2), UR (4), OVP (8), OTP (16), OCP (64) and
         * CC- (256) bits of the Status Register for the FAULT? query.
         */
-       ret = sr_scpi_send(scpi, "UNMASK 607");
-       if (ret != SR_OK)
-               return ret;
-
-       return SR_OK;
+       return sr_scpi_send(scpi, "UNMASK 607");
 }
 
 static int hp_6630a_update_status(const struct sr_dev_inst *sdi)
@@ -553,7 +548,7 @@ static int hp_6630a_update_status(const struct sr_dev_inst *sdi)
        regulation_changed = (fault & (1 << 9)) | regulation_changed;
 
        if (regulation_changed) {
-               if (cv && !cc_pos && !cc_neg &&!unreg)
+               if (cv && !cc_pos && !cc_neg && !unreg)
                        regulation = "CV";
                else if (cc_pos && !cv && !cc_neg && !unreg)
                        regulation = "CC";
@@ -561,7 +556,7 @@ static int hp_6630a_update_status(const struct sr_dev_inst *sdi)
                        regulation = "CC-";
                else if (unreg && !cv && !cc_pos && !cc_neg)
                        regulation = "UR";
-               else if (!cv && !cc_pos && !cc_neg &&!unreg)
+               else if (!cv && !cc_pos && !cc_neg && !unreg)
                        regulation = "";
                else {
                        sr_dbg("Undefined regulation for HP 66xxA "
@@ -621,6 +616,10 @@ static const struct channel_spec hp_6632b_ch[] = {
        { "1", { 0, 20.475, 0.005, 3, 4 }, { 0, 5.1188, 0.00132, 4, 5 }, { 0, 104.80743 }, FREQ_DC_ONLY, { 0, 22, 0.1 }, NO_OCP_LIMITS },
 };
 
+static const struct channel_spec hp_66312a_ch[] = {
+       { "1", { 0, 20.475, 0.0001, 4, 5 }, { 0, 2.0475, 0.0001, 4, 5 }, { 0, 41.92256 }, FREQ_DC_ONLY, { 0, 22, 0.01 }, NO_OCP_LIMITS },
+};
+
 static const struct channel_spec hp_66332a_ch[] = {
        { "1", { 0, 20.475, 0.005, 3, 4 }, { 0, 5.1188, 0.00132, 4, 5 }, { 0, 104.80743 }, FREQ_DC_ONLY, { 0, 22, 0.1 }, NO_OCP_LIMITS },
 };
@@ -638,6 +637,10 @@ static const struct channel_group_spec hp_6630b_cg[] = {
 };
 
 static const struct scpi_command hp_6630b_cmd[] = {
+       /*
+        * SCPI_CMD_REMOTE and SCPI_CMD_LOCAL are not used when GPIB is used,
+        * otherwise the device will report (non critical) error 602.
+        */
        { SCPI_CMD_REMOTE, "SYST:REM" },
        { SCPI_CMD_LOCAL, "SYST:LOC" },
        { SCPI_CMD_GET_OUTPUT_ENABLED, "OUTP:STAT?" },
@@ -661,7 +664,7 @@ static const struct scpi_command hp_6630b_cmd[] = {
        ALL_ZERO
 };
 
-static int hp_6630b_init_aquisition(const struct sr_dev_inst *sdi)
+static int hp_6630b_init_acquisition(const struct sr_dev_inst *sdi)
 {
        struct sr_scpi_dev_inst *scpi;
        int ret;
@@ -775,8 +778,8 @@ static int hp_6630b_update_status(const struct sr_dev_inst *sdi)
                /*
                 * Check if output state has changed, due to one of the
                 * questionable states changed.
-                * NOTE: The output state is send even if it hasn't changed, but that
-                * only happends rarely.
+                * NOTE: The output state is sent even if it hasn't changed,
+                * but that only happens rarely.
                 */
                ret = sr_scpi_get_bool(scpi, "OUTP:STAT?", &output_enabled);
                if (ret != SR_OK)
@@ -808,7 +811,7 @@ static int hp_6630b_update_status(const struct sr_dev_inst *sdi)
        }
 
        if (regulation_changed) {
-               if (cv && !cc_pos && !cc_neg &&!unreg)
+               if (cv && !cc_pos && !cc_neg && !unreg)
                        regulation = "CV";
                else if (cc_pos && !cv && !cc_neg && !unreg)
                        regulation = "CC";
@@ -816,11 +819,11 @@ static int hp_6630b_update_status(const struct sr_dev_inst *sdi)
                        regulation = "CC-";
                else if (unreg && !cv && !cc_pos && !cc_neg)
                        regulation = "UR";
-               else if (!cv && !cc_pos && !cc_neg &&!unreg)
-                       /* This happends in case of OCP active */
+               else if (!cv && !cc_pos && !cc_neg && !unreg)
+                       /* This happens in case of OCP active. */
                        regulation = "";
                else {
-                       /* This happends from time to time (CV and CC+ active). */
+                       /* This happens from time to time (CV and CC+ active). */
                        sr_dbg("Undefined regulation for HP 66xxB "
                                "(CV=%i, CC+=%i, CC-=%i, UR=%i).",
                                cv, cc_pos, cc_neg, unreg);
@@ -1043,7 +1046,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(agilent_n5700a_cg),
                agilent_n5700a_cmd,
                .probe_channels = NULL,
-               .init_aquisition = NULL,
+               .init_acquisition = NULL,
                .update_status = NULL,
        },
 
@@ -1055,7 +1058,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(agilent_n5700a_cg),
                agilent_n5700a_cmd,
                .probe_channels = NULL,
-               .init_aquisition = NULL,
+               .init_acquisition = NULL,
                .update_status = NULL,
        },
 
@@ -1067,7 +1070,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(bk_9130_cg),
                bk_9130_cmd,
                .probe_channels = NULL,
-               .init_aquisition = NULL,
+               .init_acquisition = NULL,
                .update_status = NULL,
        },
 
@@ -1079,7 +1082,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(chroma_61604_cg),
                chroma_61604_cmd,
                .probe_channels = NULL,
-               .init_aquisition = NULL,
+               .init_acquisition = NULL,
                .update_status = NULL,
        },
 
@@ -1091,7 +1094,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                NULL, 0,
                chroma_62000_cmd,
                .probe_channels = chroma_62000p_probe_channels,
-               .init_aquisition = NULL,
+               .init_acquisition = NULL,
                .update_status = NULL,
        },
 
@@ -1108,7 +1111,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(hp_6630a_cg),
                hp_6630a_cmd,
                .probe_channels = NULL,
-               hp_6630a_init_aquisition,
+               hp_6630a_init_acquisition,
                hp_6630a_update_status,
        },
        */
@@ -1121,7 +1124,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(hp_6630a_cg),
                hp_6630a_cmd,
                .probe_channels = NULL,
-               hp_6630a_init_aquisition,
+               hp_6630a_init_acquisition,
                hp_6630a_update_status,
        },
 
@@ -1133,7 +1136,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(hp_6630a_cg),
                hp_6630a_cmd,
                .probe_channels = NULL,
-               hp_6630a_init_aquisition,
+               hp_6630a_init_acquisition,
                hp_6630a_update_status,
        },
 
@@ -1145,7 +1148,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(hp_6630a_cg),
                hp_6630a_cmd,
                .probe_channels = NULL,
-               hp_6630a_init_aquisition,
+               hp_6630a_init_acquisition,
                hp_6630a_update_status,
        },
 
@@ -1157,7 +1160,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(hp_6630b_cg),
                hp_6630b_cmd,
                .probe_channels = NULL,
-               hp_6630b_init_aquisition,
+               hp_6630b_init_acquisition,
                hp_6630b_update_status,
        },
 
@@ -1169,7 +1172,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(hp_6630b_cg),
                hp_6630b_cmd,
                .probe_channels = NULL,
-               hp_6630b_init_aquisition,
+               hp_6630b_init_acquisition,
                hp_6630b_update_status,
        },
 
@@ -1181,7 +1184,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(hp_6630b_cg),
                hp_6630b_cmd,
                .probe_channels = NULL,
-               hp_6630b_init_aquisition,
+               hp_6630b_init_acquisition,
                hp_6630b_update_status,
        },
 
@@ -1193,7 +1196,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(hp_6630b_cg),
                hp_6630b_cmd,
                .probe_channels = NULL,
-               hp_6630b_init_aquisition,
+               hp_6630b_init_acquisition,
                hp_6630b_update_status,
        },
 
@@ -1205,7 +1208,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(hp_6630b_cg),
                hp_6630b_cmd,
                .probe_channels = NULL,
-               hp_6630b_init_aquisition,
+               hp_6630b_init_acquisition,
                hp_6630b_update_status,
        },
 
@@ -1217,7 +1220,19 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(hp_6630b_cg),
                hp_6630b_cmd,
                .probe_channels = NULL,
-               hp_6630b_init_aquisition,
+               hp_6630b_init_acquisition,
+               hp_6630b_update_status,
+       },
+
+       /* HP 66312A */
+       { "HP", "66312A", SCPI_DIALECT_HP_66XXB, PPS_OTP,
+               ARRAY_AND_SIZE(hp_6630b_devopts),
+               ARRAY_AND_SIZE(hp_6630b_devopts_cg),
+               ARRAY_AND_SIZE(hp_66312a_ch),
+               ARRAY_AND_SIZE(hp_6630b_cg),
+               hp_6630b_cmd,
+               .probe_channels = NULL,
+               hp_6630b_init_acquisition,
                hp_6630b_update_status,
        },
 
@@ -1229,7 +1244,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(hp_6630b_cg),
                hp_6630b_cmd,
                .probe_channels = NULL,
-               hp_6630b_init_aquisition,
+               hp_6630b_init_acquisition,
                hp_6630b_update_status,
        },
 
@@ -1241,7 +1256,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(hp_6630b_cg),
                hp_6630b_cmd,
                .probe_channels = NULL,
-               hp_6630b_init_aquisition,
+               hp_6630b_init_acquisition,
                hp_6630b_update_status,
        },
 
@@ -1253,7 +1268,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(hp_6630b_cg),
                hp_6630b_cmd,
                .probe_channels = NULL,
-               hp_6630b_init_aquisition,
+               hp_6630b_init_acquisition,
                hp_6630b_update_status,
        },
 
@@ -1265,7 +1280,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(rigol_dp700_cg),
                rigol_dp700_cmd,
                .probe_channels = NULL,
-               .init_aquisition = NULL,
+               .init_acquisition = NULL,
                .update_status = NULL,
        },
        { "Rigol", "^DP712$", SCPI_DIALECT_UNKNOWN, 0,
@@ -1275,7 +1290,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(rigol_dp700_cg),
                rigol_dp700_cmd,
                .probe_channels = NULL,
-               .init_aquisition = NULL,
+               .init_acquisition = NULL,
                .update_status = NULL,
        },
 
@@ -1287,7 +1302,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(rigol_dp820_cg),
                rigol_dp800_cmd,
                .probe_channels = NULL,
-               .init_aquisition = NULL,
+               .init_acquisition = NULL,
                .update_status = NULL,
        },
        { "Rigol", "^DP831A$", SCPI_DIALECT_UNKNOWN, PPS_OTP,
@@ -1297,7 +1312,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(rigol_dp830_cg),
                rigol_dp800_cmd,
                .probe_channels = NULL,
-               .init_aquisition = NULL,
+               .init_acquisition = NULL,
                .update_status = NULL,
        },
        { "Rigol", "^(DP832|DP832A)$", SCPI_DIALECT_UNKNOWN, PPS_OTP,
@@ -1307,7 +1322,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(rigol_dp830_cg),
                rigol_dp800_cmd,
                .probe_channels = NULL,
-               .init_aquisition = NULL,
+               .init_acquisition = NULL,
                .update_status = NULL,
        },
 
@@ -1319,7 +1334,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                NULL, 0,
                philips_pm2800_cmd,
                philips_pm2800_probe_channels,
-               .init_aquisition = NULL,
+               .init_acquisition = NULL,
                .update_status = NULL,
        },
 
@@ -1331,7 +1346,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(rs_hmc8043_cg),
                rs_hmc8043_cmd,
                .probe_channels = NULL,
-               .init_aquisition = NULL,
+               .init_acquisition = NULL,
                .update_status = NULL,
        },
 };