Constify a few arrays and variables.

[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 5be14127b9020e62ffeaace7b96b9e4e6435045f..50d7d93a395d82c593ef95f08ab27a4f11de53f9 100644 (file)
--- a/src/hardware/scpi-pps/profiles.c
+++ b/src/hardware/scpi-pps/profiles.c
@@ -44,8 +44,7 @@ static const uint32_t devopts_none[] = { };
 
 /* Rigol DP800 series */
 static const uint32_t rigol_dp800_devopts[] = {
-       SR_CONF_POWER_SUPPLY,
-       SR_CONF_CONTINUOUS,
+       SR_CONF_CONTINUOUS | SR_CONF_SET,
        SR_CONF_OVER_TEMPERATURE_PROTECTION | SR_CONF_GET | SR_CONF_SET,
 };
 
@@ -64,25 +63,35 @@ static const uint32_t rigol_dp800_devopts_cg[] = {
        SR_CONF_OUTPUT_ENABLED | SR_CONF_GET | SR_CONF_SET,
 };
 
-struct channel_spec rigol_dp831_ch[] = {
+const struct channel_spec rigol_dp821a_ch[] = {
+       { "1", { 0, 60, 0.001 }, { 0, 1, 0.0001 } },
+       { "2", { 0, 8, 0.001 }, { 0, 10, 0.001 } },
+};
+
+const struct channel_spec rigol_dp831_ch[] = {
        { "1", { 0, 8, 0.001 }, { 0, 5, 0.0003 } },
        { "2", { 0, 30, 0.001 }, { 0, 2, 0.0001 } },
        { "3", { 0, -30, 0.001 }, { 0, 2, 0.0001 } },
 };
 
-struct channel_spec rigol_dp832_ch[] = {
+const struct channel_spec rigol_dp832_ch[] = {
        { "1", { 0, 30, 0.001 }, { 0, 3, 0.001 } },
        { "2", { 0, 30, 0.001 }, { 0, 3, 0.001 } },
        { "3", { 0, 5, 0.001 }, { 0, 3, 0.001 } },
 };
 
-struct channel_group_spec rigol_dp800_cg[] = {
+const struct channel_group_spec rigol_dp820_cg[] = {
+       { "1", CH_IDX(0), PPS_OVP | PPS_OCP },
+       { "2", CH_IDX(1), PPS_OVP | PPS_OCP },
+};
+
+const struct channel_group_spec rigol_dp830_cg[] = {
        { "1", CH_IDX(0), PPS_OVP | PPS_OCP },
        { "2", CH_IDX(1), PPS_OVP | PPS_OCP },
        { "3", CH_IDX(2), PPS_OVP | PPS_OCP },
 };
 
-struct scpi_command rigol_dp800_cmd[] = {
+const struct scpi_command rigol_dp800_cmd[] = {
        { SCPI_CMD_REMOTE, "SYST:REMOTE" },
        { SCPI_CMD_LOCAL, "SYST:LOCAL" },
        { SCPI_CMD_BEEPER, "SYST:BEEP:STAT?" },
@@ -119,8 +128,7 @@ struct scpi_command rigol_dp800_cmd[] = {
 
 /* HP 663xx series */
 static const uint32_t hp_6632b_devopts[] = {
-       SR_CONF_POWER_SUPPLY,
-       SR_CONF_CONTINUOUS,
+       SR_CONF_CONTINUOUS | SR_CONF_SET,
        SR_CONF_OUTPUT_ENABLED | SR_CONF_GET | SR_CONF_SET,
        SR_CONF_OUTPUT_VOLTAGE | SR_CONF_GET,
        SR_CONF_OUTPUT_CURRENT | SR_CONF_GET,
@@ -128,15 +136,15 @@ static const uint32_t hp_6632b_devopts[] = {
        SR_CONF_OUTPUT_CURRENT_LIMIT | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 };
 
-struct channel_spec hp_6632b_ch[] = {
+const struct channel_spec hp_6632b_ch[] = {
        { "1", { 0, 20.475, 0.005 }, { 0, 5.1188, 0.00132 } },
 };
 
-struct channel_group_spec hp_6632b_cg[] = {
+const struct channel_group_spec hp_6632b_cg[] = {
        { "1", CH_IDX(0), 0 },
 };
 
-struct scpi_command hp_6632b_cmd[] = {
+const struct scpi_command hp_6632b_cmd[] = {
        { SCPI_CMD_GET_OUTPUT_ENABLED, "OUTP:STAT?" },
        { SCPI_CMD_SET_OUTPUT_ENABLE, "OUTP:STAT ON" },
        { SCPI_CMD_SET_OUTPUT_DISABLE, "OUTP:STAT OFF" },
@@ -150,8 +158,7 @@ struct scpi_command hp_6632b_cmd[] = {
 
 /* Philips/Fluke PM2800 series */
 static const uint32_t philips_pm2800_devopts[] = {
-       SR_CONF_POWER_SUPPLY,
-       SR_CONF_CONTINUOUS,
+       SR_CONF_CONTINUOUS | SR_CONF_SET,
 };
 
 static const uint32_t philips_pm2800_devopts_cg[] = {
@@ -176,7 +183,7 @@ enum philips_pm2800_modules {
        PM2800_MOD_120V_1A,
 };
 
-static struct philips_pm2800_module_spec {
+static const struct philips_pm2800_module_spec {
        /* Min, max, programming resolution. */
        float voltage[3];
        float current[3];
@@ -191,7 +198,7 @@ static struct philips_pm2800_module_spec {
        [PM2800_MOD_120V_1A] = { { 0, 120, 0.030 }, { -1, 1, 0.00025 } },
 };
 
-static struct philips_pm2800_model {
+static const struct philips_pm2800_model {
        unsigned int chassis;
        unsigned int num_modules;
        unsigned int set;
@@ -219,15 +226,15 @@ static struct philips_pm2800_model {
        { 3, 2, 3, { PM2800_MOD_8V_15A, PM2800_MOD_8V_15A, 0 } },
 };
 
-static char *philips_pm2800_names[] = { "1", "2", "3" };
+static const char *philips_pm2800_names[] = { "1", "2", "3" };
 
 static int philips_pm2800_probe_channels(struct sr_dev_inst *sdi,
                struct sr_scpi_hw_info *hw_info,
                struct channel_spec **channels, unsigned int *num_channels,
                struct channel_group_spec **channel_groups, unsigned int *num_channel_groups)
 {
-       struct philips_pm2800_model *model;
-       struct philips_pm2800_module_spec *spec;
+       const struct philips_pm2800_model *model;
+       const struct philips_pm2800_module_spec *spec;
        unsigned int chassis, num_modules, set, module, m, i;
 
        (void)sdi;
@@ -263,9 +270,9 @@ static int philips_pm2800_probe_channels(struct sr_dev_inst *sdi,
                sr_dbg("output %d: %.0f - %.0fV, %.0f - %.0fA", i + 1,
                                spec->voltage[0], spec->voltage[1],
                                spec->current[0], spec->current[1]);
-               (*channels)[i].name = philips_pm2800_names[i];
+               (*channels)[i].name = (char *)philips_pm2800_names[i];
                memcpy(&((*channels)[i].voltage), spec, sizeof(float) * 6);
-               (*channel_groups)[i].name = philips_pm2800_names[i];
+               (*channel_groups)[i].name = (char *)philips_pm2800_names[i];
                (*channel_groups)[i].channel_index_mask = 1 << i;
                (*channel_groups)[i].features = PPS_OTP | PPS_OVP | PPS_OCP;
        }
@@ -274,7 +281,7 @@ static int philips_pm2800_probe_channels(struct sr_dev_inst *sdi,
        return SR_OK;
 }
 
-struct scpi_command philips_pm2800_cmd[] = {
+const struct scpi_command philips_pm2800_cmd[] = {
        { SCPI_CMD_SELECT_CHANNEL, ":INST:NSEL %s" },
        { SCPI_CMD_GET_MEAS_VOLTAGE, ":MEAS:VOLT?" },
        { SCPI_CMD_GET_MEAS_CURRENT, ":MEAS:CURR?" },
@@ -295,7 +302,6 @@ struct scpi_command philips_pm2800_cmd[] = {
        { SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ACTIVE, ":SOUR:CURR:PROT:TRIP?" },
 };
 
-
 SR_PRIV const struct scpi_pps pps_profiles[] = {
        /* HP 6632B */
        { "HP", "6632B", 0,
@@ -308,11 +314,19 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
        },
 
        /* Rigol DP800 series */
+       { "Rigol", "^DP821A$", PPS_OTP,
+               ARRAY_AND_SIZE(rigol_dp800_devopts),
+               ARRAY_AND_SIZE(rigol_dp800_devopts_cg),
+               ARRAY_AND_SIZE(rigol_dp821a_ch),
+               ARRAY_AND_SIZE(rigol_dp820_cg),
+               ARRAY_AND_SIZE(rigol_dp800_cmd),
+               .probe_channels = NULL,
+       },
        { "Rigol", "^DP831A$", PPS_OTP,
                ARRAY_AND_SIZE(rigol_dp800_devopts),
                ARRAY_AND_SIZE(rigol_dp800_devopts_cg),
                ARRAY_AND_SIZE(rigol_dp831_ch),
-               ARRAY_AND_SIZE(rigol_dp800_cg),
+               ARRAY_AND_SIZE(rigol_dp830_cg),
                ARRAY_AND_SIZE(rigol_dp800_cmd),
                .probe_channels = NULL,
        },
@@ -320,7 +334,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                ARRAY_AND_SIZE(rigol_dp800_devopts),
                ARRAY_AND_SIZE(rigol_dp800_devopts_cg),
                ARRAY_AND_SIZE(rigol_dp832_ch),
-               ARRAY_AND_SIZE(rigol_dp800_cg),
+               ARRAY_AND_SIZE(rigol_dp830_cg),
                ARRAY_AND_SIZE(rigol_dp800_cmd),
                .probe_channels = NULL,
        },
@@ -335,5 +349,5 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                philips_pm2800_probe_channels,
        },
 };
-SR_PRIV unsigned int num_pps_profiles = ARRAY_SIZE(pps_profiles);
 
+SR_PRIV unsigned int num_pps_profiles = ARRAY_SIZE(pps_profiles);