(*model->timebases)[state->timebase][1]);
break;
case SR_CONF_NUM_VDIV:
- if (!cg) {
+ if (!cg)
return SR_ERR_CHANNEL_GROUP;
- } else if (cg_type == CG_ANALOG) {
- if (std_cg_idx(cg, devc->analog_groups, model->analog_channels) < 0)
- return SR_ERR_ARG;
- *data = g_variant_new_int32(model->num_ydivs);
- } else {
+ if (cg_type != CG_ANALOG)
return SR_ERR_NA;
- }
+ if (std_cg_idx(cg, devc->analog_groups, model->analog_channels) < 0)
+ return SR_ERR_ARG;
+ *data = g_variant_new_int32(model->num_ydivs);
break;
case SR_CONF_VDIV:
- if (!cg) {
+ if (!cg)
return SR_ERR_CHANNEL_GROUP;
- } else if (cg_type == CG_ANALOG) {
- if ((idx = std_cg_idx(cg, devc->analog_groups, model->analog_channels)) < 0)
- return SR_ERR_ARG;
- *data = g_variant_new("(tt)",
- (*model->vdivs)[state->analog_channels[idx].vdiv][0],
- (*model->vdivs)[state->analog_channels[idx].vdiv][1]);
- } else {
+ if (cg_type != CG_ANALOG)
return SR_ERR_NA;
- }
+ if ((idx = std_cg_idx(cg, devc->analog_groups, model->analog_channels)) < 0)
+ return SR_ERR_ARG;
+ *data = g_variant_new("(tt)",
+ (*model->vdivs)[state->analog_channels[idx].vdiv][0],
+ (*model->vdivs)[state->analog_channels[idx].vdiv][1]);
break;
case SR_CONF_TRIGGER_SOURCE:
*data = g_variant_new_string((*model->trigger_sources)[state->trigger_source]);
*data = g_variant_new_double(state->horiz_triggerpos);
break;
case SR_CONF_COUPLING:
- if (!cg) {
+ if (!cg)
return SR_ERR_CHANNEL_GROUP;
- } else if (cg_type == CG_ANALOG) {
- if ((idx = std_cg_idx(cg, devc->analog_groups, model->analog_channels)) < 0)
- return SR_ERR_ARG;
- *data = g_variant_new_string((*model->coupling_options)[state->analog_channels[idx].coupling]);
- } else {
+ if (cg_type != CG_ANALOG)
return SR_ERR_NA;
- }
+ if ((idx = std_cg_idx(cg, devc->analog_groups, model->analog_channels)) < 0)
+ return SR_ERR_ARG;
+ *data = g_variant_new_string((*model->coupling_options)[state->analog_channels[idx].coupling]);
break;
case SR_CONF_SAMPLERATE:
*data = g_variant_new_uint64(state->sample_rate);
state = devc->model_state;
update_sample_rate = FALSE;
- ret = SR_ERR_NA;
-
switch (key) {
case SR_CONF_LIMIT_FRAMES:
devc->frame_limit = g_variant_get_uint64(data);
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);
}
case SR_CONF_COUPLING:
if (!cg)
return SR_ERR_CHANNEL_GROUP;
+ if (!model)
+ return SR_ERR_ARG;
*data = g_variant_new_strv(*model->coupling_options, model->num_coupling_options);
break;
case SR_CONF_TRIGGER_SOURCE:
case SR_CONF_VDIV:
if (!cg)
return SR_ERR_CHANNEL_GROUP;
+ if (!model)
+ return SR_ERR_ARG;
*data = std_gvar_tuple_array(*model->vdivs, model->num_vdivs);
break;
default:
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;
break;
default:
+ g_free(pod_enabled);
return SR_ERR;
}
}
+ 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;