case SR_CONF_DEVICE_OPTIONS:
if (!cg) {
if (model)
- *data = std_gvar_array_u32((const uint32_t *)model->devopts, model->num_devopts);
+ *data = std_gvar_array_u32(*model->devopts, model->num_devopts);
else
*data = std_gvar_array_u32(ARRAY_AND_SIZE(drvopts));
} else if (cg_type == CG_ANALOG) {
- *data = std_gvar_array_u32((const uint32_t *)model->devopts_cg_analog, model->num_devopts_cg_analog);
+ *data = std_gvar_array_u32(*model->devopts_cg_analog, model->num_devopts_cg_analog);
} else {
*data = std_gvar_array_u32(NULL, 0);
}
struct sr_channel *ch;
struct dev_context *devc;
struct sr_scpi_dev_inst *scpi;
+ int ret;
devc = sdi->priv;
scpi = sdi->conn;
(*model->scpi_dialect)[SCPI_CMD_SET_ANALOG_CHAN_STATE],
ch->index + 1, ch->enabled);
- if (sr_scpi_send(scpi, command) != SR_OK)
+ if (sr_scpi_send(scpi, command) != SR_OK) {
+ g_free(pod_enabled);
return SR_ERR;
+ }
state->analog_channels[ch->index].state = ch->enabled;
setup_changed = TRUE;
break;
(*model->scpi_dialect)[SCPI_CMD_SET_DIG_CHAN_STATE],
ch->index, ch->enabled);
- if (sr_scpi_send(scpi, command) != SR_OK)
+ if (sr_scpi_send(scpi, command) != SR_OK) {
+ g_free(pod_enabled);
return SR_ERR;
+ }
state->digital_channels[ch->index] = ch->enabled;
setup_changed = TRUE;
}
}
+ ret = SR_OK;
for (i = 0; i < model->digital_pods; i++) {
if (state->digital_pods[i] == pod_enabled[i])
continue;
g_snprintf(command, sizeof(command),
(*model->scpi_dialect)[SCPI_CMD_SET_DIG_POD_STATE],
i + 1, pod_enabled[i]);
- if (sr_scpi_send(scpi, command) != SR_OK)
- return SR_ERR;
+ if (sr_scpi_send(scpi, command) != SR_OK) {
+ ret = SR_ERR;
+ break;
+ }
state->digital_pods[i] = pod_enabled[i];
setup_changed = TRUE;
}
-
g_free(pod_enabled);
+ if (ret != SR_OK)
+ return ret;
if (setup_changed && hmo_update_sample_rate(sdi) != SR_OK)
return SR_ERR;