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);
}
(*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;