};
static const char *trigger_sources[] = {
- "CH1",
- "CH2",
- "CH3",
- "CH4",
- "EXT",
- "AC Line",
- "D0",
- "D1",
- "D2",
- "D3",
- "D4",
- "D5",
- "D6",
- "D7",
- "D8",
- "D9",
- "D10",
- "D11",
- "D12",
- "D13",
- "D14",
- "D15",
+ "CH1", "CH2", "CH3", "CH4",
+ "EXT", "AC Line",
+ "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7",
+ "D8", "D9", "D10", "D11", "D12", "D13", "D14", "D15",
};
static const char *trigger_slopes[] = {
- "r",
- "f",
+ "r", "f",
};
static const char *coupling[] = {
- "AC",
- "DC",
- "GND",
+ "AC", "DC", "GND",
};
static const uint64_t probe_factor[] = {
- 1,
- 2,
- 5,
- 10,
- 20,
- 50,
- 100,
- 200,
- 500,
- 1000,
+ 1, 2, 5, 10, 20, 50, 100, 200, 500, 1000,
};
/* Do not change the order of entries */
}
}
-static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
- const struct sr_channel_group *cg)
+static int config_get(uint32_t key, GVariant **data,
+ const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{
struct dev_context *devc;
struct sr_channel *ch;
return SR_OK;
}
-static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
- const struct sr_channel_group *cg)
+static int config_set(uint32_t key, GVariant *data,
+ const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{
struct dev_context *devc;
- uint64_t p, q;
+ uint64_t p;
double t_dbl;
- unsigned int i, j;
- int ret;
+ int ret, idx, i;
const char *tmp_str;
char buffer[16];
return SR_ERR;
}
- ret = SR_OK;
switch (key) {
case SR_CONF_LIMIT_FRAMES:
devc->limit_frames = g_variant_get_uint64(data);
break;
case SR_CONF_TRIGGER_SLOPE:
- tmp_str = g_variant_get_string(data, NULL);
-
- if (!tmp_str || !(tmp_str[0] == 'f' || tmp_str[0] == 'r')) {
- sr_err("Unknown trigger slope: '%s'.",
- (tmp_str) ? tmp_str : "NULL");
+ if ((idx = std_str_idx(data, ARRAY_AND_SIZE(trigger_slopes))) < 0)
return SR_ERR_ARG;
- }
-
g_free(devc->trigger_slope);
- devc->trigger_slope = g_strdup((tmp_str[0] == 'r') ? "POS" : "NEG");
- ret = rigol_ds_config_set(sdi, ":TRIG:EDGE:SLOP %s", devc->trigger_slope);
- break;
+ devc->trigger_slope = g_strdup((trigger_slopes[idx][0] == 'r') ? "POS" : "NEG");
+ return rigol_ds_config_set(sdi, ":TRIG:EDGE:SLOP %s", devc->trigger_slope);
case SR_CONF_HORIZ_TRIGGERPOS:
t_dbl = g_variant_get_double(data);
if (t_dbl < 0.0 || t_dbl > 1.0) {
* need to express this in seconds. */
t_dbl = -(devc->horiz_triggerpos - 0.5) * devc->timebase * devc->num_timebases;
g_ascii_formatd(buffer, sizeof(buffer), "%.6f", t_dbl);
- ret = rigol_ds_config_set(sdi, ":TIM:OFFS %s", buffer);
- break;
+ return rigol_ds_config_set(sdi, ":TIM:OFFS %s", buffer);
case SR_CONF_TRIGGER_LEVEL:
t_dbl = g_variant_get_double(data);
g_ascii_formatd(buffer, sizeof(buffer), "%.3f", t_dbl);
ret = rigol_ds_config_set(sdi, ":TRIG:EDGE:LEV %s", buffer);
if (ret == SR_OK)
devc->trigger_level = t_dbl;
- break;
+ return ret;
case SR_CONF_TIMEBASE:
- g_variant_get(data, "(tt)", &p, &q);
- for (i = 0; i < devc->num_timebases; i++) {
- if (devc->timebases[i][0] == p && devc->timebases[i][1] == q) {
- devc->timebase = (float)p / q;
- g_ascii_formatd(buffer, sizeof(buffer), "%.9f",
- devc->timebase);
- ret = rigol_ds_config_set(sdi, ":TIM:SCAL %s", buffer);
- break;
- }
- }
- if (i == devc->num_timebases) {
- sr_err("Invalid timebase index: %d.", i);
- ret = SR_ERR_ARG;
- }
- break;
+ if ((idx = std_u64_tuple_idx(data, devc->timebases, devc->num_timebases)) < 0)
+ return SR_ERR_ARG;
+ devc->timebase = (float)devc->timebases[idx][0] / devc->timebases[idx][1];
+ g_ascii_formatd(buffer, sizeof(buffer), "%.9f",
+ devc->timebase);
+ return rigol_ds_config_set(sdi, ":TIM:SCAL %s", buffer);
case SR_CONF_TRIGGER_SOURCE:
- tmp_str = g_variant_get_string(data, NULL);
- for (i = 0; i < ARRAY_SIZE(trigger_sources); i++) {
- if (!strcmp(trigger_sources[i], tmp_str)) {
- g_free(devc->trigger_source);
- devc->trigger_source = g_strdup(trigger_sources[i]);
- if (!strcmp(devc->trigger_source, "AC Line"))
- tmp_str = "ACL";
- else if (!strcmp(devc->trigger_source, "CH1"))
- tmp_str = "CHAN1";
- else if (!strcmp(devc->trigger_source, "CH2"))
- tmp_str = "CHAN2";
- else if (!strcmp(devc->trigger_source, "CH3"))
- tmp_str = "CHAN3";
- else if (!strcmp(devc->trigger_source, "CH4"))
- tmp_str = "CHAN4";
- else
- tmp_str = (char *)devc->trigger_source;
- ret = rigol_ds_config_set(sdi, ":TRIG:EDGE:SOUR %s", tmp_str);
- break;
- }
- }
- if (i == ARRAY_SIZE(trigger_sources)) {
- sr_err("Invalid trigger source index: %d.", i);
- ret = SR_ERR_ARG;
- }
- break;
+ if ((idx = std_str_idx(data, ARRAY_AND_SIZE(trigger_sources))) < 0)
+ return SR_ERR_ARG;
+ g_free(devc->trigger_source);
+ devc->trigger_source = g_strdup(trigger_sources[idx]);
+ if (!strcmp(devc->trigger_source, "AC Line"))
+ tmp_str = "ACL";
+ else if (!strcmp(devc->trigger_source, "CH1"))
+ tmp_str = "CHAN1";
+ else if (!strcmp(devc->trigger_source, "CH2"))
+ tmp_str = "CHAN2";
+ else if (!strcmp(devc->trigger_source, "CH3"))
+ tmp_str = "CHAN3";
+ else if (!strcmp(devc->trigger_source, "CH4"))
+ tmp_str = "CHAN4";
+ else
+ tmp_str = (char *)devc->trigger_source;
+ return rigol_ds_config_set(sdi, ":TRIG:EDGE:SOUR %s", tmp_str);
case SR_CONF_VDIV:
if (!cg)
return SR_ERR_CHANNEL_GROUP;
- g_variant_get(data, "(tt)", &p, &q);
- for (i = 0; i < devc->model->analog_channels; i++) {
- if (cg == devc->analog_groups[i]) {
- for (j = 0; j < ARRAY_SIZE(vdivs); j++) {
- if (vdivs[j][0] != p || vdivs[j][1] != q)
- continue;
- devc->vdiv[i] = (float)p / q;
- g_ascii_formatd(buffer, sizeof(buffer), "%.3f",
- devc->vdiv[i]);
- return rigol_ds_config_set(sdi, ":CHAN%d:SCAL %s", i + 1,
- buffer);
- }
- sr_err("Invalid vdiv index: %d.", j);
- return SR_ERR_ARG;
- }
- }
- sr_dbg("Didn't set vdiv, unknown channel(group).");
- return SR_ERR_NA;
+ if ((i = std_cg_idx(cg, devc->analog_groups, devc->model->analog_channels)) < 0)
+ return SR_ERR_ARG;
+ if ((idx = std_u64_tuple_idx(data, ARRAY_AND_SIZE(vdivs))) < 0)
+ return SR_ERR_ARG;
+ devc->vdiv[i] = (float)vdivs[idx][0] / vdivs[idx][1];
+ g_ascii_formatd(buffer, sizeof(buffer), "%.3f", devc->vdiv[i]);
+ return rigol_ds_config_set(sdi, ":CHAN%d:SCAL %s", i + 1, buffer);
case SR_CONF_COUPLING:
if (!cg)
return SR_ERR_CHANNEL_GROUP;
- tmp_str = g_variant_get_string(data, NULL);
- for (i = 0; i < devc->model->analog_channels; i++) {
- if (cg == devc->analog_groups[i]) {
- for (j = 0; j < ARRAY_SIZE(coupling); j++) {
- if (!strcmp(tmp_str, coupling[j])) {
- g_free(devc->coupling[i]);
- devc->coupling[i] = g_strdup(coupling[j]);
- return rigol_ds_config_set(sdi, ":CHAN%d:COUP %s", i + 1,
- devc->coupling[i]);
- }
- }
- sr_err("Invalid coupling index: %d.", j);
- return SR_ERR_ARG;
- }
- }
- sr_dbg("Didn't set coupling, unknown channel(group).");
- return SR_ERR_NA;
+ if ((i = std_cg_idx(cg, devc->analog_groups, devc->model->analog_channels)) < 0)
+ return SR_ERR_ARG;
+ if ((idx = std_str_idx(data, ARRAY_AND_SIZE(coupling))) < 0)
+ return SR_ERR_ARG;
+ g_free(devc->coupling[i]);
+ devc->coupling[i] = g_strdup(coupling[idx]);
+ return rigol_ds_config_set(sdi, ":CHAN%d:COUP %s", i + 1, devc->coupling[i]);
case SR_CONF_PROBE_FACTOR:
if (!cg)
return SR_ERR_CHANNEL_GROUP;
+ if ((i = std_cg_idx(cg, devc->analog_groups, devc->model->analog_channels)) < 0)
+ return SR_ERR_ARG;
+ if ((idx = std_u64_idx(data, ARRAY_AND_SIZE(probe_factor))) < 0)
+ return SR_ERR_ARG;
p = g_variant_get_uint64(data);
- for (i = 0; i < devc->model->analog_channels; i++) {
- if (cg == devc->analog_groups[i]) {
- for (j = 0; j < ARRAY_SIZE(probe_factor); j++) {
- if (p == probe_factor[j]) {
- devc->attenuation[i] = p;
- ret = rigol_ds_config_set(sdi, ":CHAN%d:PROB %"PRIu64,
- i + 1, p);
- if (ret == SR_OK)
- rigol_ds_get_dev_cfg_vertical(sdi);
- return ret;
- }
- }
- sr_err("Invalid probe factor: %"PRIu64".", p);
- return SR_ERR_ARG;
- }
- }
- sr_dbg("Didn't set probe factor, unknown channel(group).");
- return SR_ERR_NA;
+ devc->attenuation[i] = probe_factor[idx];
+ ret = rigol_ds_config_set(sdi, ":CHAN%d:PROB %"PRIu64, i + 1, p);
+ if (ret == SR_OK)
+ rigol_ds_get_dev_cfg_vertical(sdi);
+ return ret;
case SR_CONF_DATA_SOURCE:
tmp_str = g_variant_get_string(data, NULL);
if (!strcmp(tmp_str, "Live"))
return SR_ERR_NA;
}
- return ret;
+ return SR_OK;
}
-static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
- const struct sr_channel_group *cg)
+static int config_list(uint32_t key, GVariant **data,
+ const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{
- unsigned int i;
struct dev_context *devc;
devc = (sdi) ? sdi->priv : NULL;
*data = std_gvar_array_u32(NULL, 0);
return SR_OK;
} else {
- for (i = 0; i < devc->model->analog_channels; i++) {
- if (cg == devc->analog_groups[i]) {
- *data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg_analog));
- return SR_OK;
- }
- }
- return SR_ERR_NA;
+ if (std_cg_idx(cg, devc->analog_groups, devc->model->analog_channels) < 0)
+ return SR_ERR_ARG;
+ *data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg_analog));
+ return SR_OK;
}
break;
case SR_CONF_COUPLING:
return SR_ERR_ARG;
if (!cg)
return SR_ERR_CHANNEL_GROUP;
- *data = std_gvar_tuple_array((const uint64_t (*)[][2])devc->vdivs, devc->num_vdivs);
+ *data = std_gvar_tuple_array(devc->vdivs, devc->num_vdivs);
break;
case SR_CONF_TIMEBASE:
if (!devc)
return SR_ERR_ARG;
if (devc->num_timebases <= 0)
return SR_ERR_NA;
- *data = std_gvar_tuple_array((const uint64_t (*)[][2])devc->timebases, devc->num_timebases);
+ *data = std_gvar_tuple_array(devc->timebases, devc->num_timebases);
break;
case SR_CONF_TRIGGER_SOURCE:
if (!devc)