};
static const char *trigger_sources[] = {
- "CH1",
- "CH2",
- "EXT",
+ "CH1", "CH2", "EXT",
/* TODO: forced */
};
static const char *trigger_slopes[] = {
- "r",
- "f",
+ "r", "f",
};
static const char *coupling[] = {
- "AC",
- "DC",
- "GND",
+ "AC", "DC", "GND",
};
static struct sr_dev_inst *dso_dev_new(const struct dso_profile *prof)
return SR_OK;
}
-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_usb_dev_inst *usb;
- char str[128];
const char *s;
const uint64_t *vdiv;
int ch_idx;
/* Device still needs to re-enumerate after firmware
* upload, so we don't know its (future) address. */
return SR_ERR;
- snprintf(str, 128, "%d.%d", usb->bus, usb->address);
- *data = g_variant_new_string(str);
+ *data = g_variant_new_printf("%d.%d", usb->bus, usb->address);
break;
case SR_CONF_TIMEBASE:
*data = g_variant_new("(tt)", timebases[devc->timebase][0],
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;
double tmp_double;
- uint64_t tmp_u64, p, q;
- int tmp_int, ch_idx;
- unsigned int i;
- const char *tmp_str;
+ int ch_idx, idx;
devc = sdi->priv;
if (!cg) {
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'))
+ if ((idx = std_str_idx(data, ARRAY_AND_SIZE(trigger_slopes))) < 0)
return SR_ERR_ARG;
- devc->triggerslope = (tmp_str[0] == 'r')
+ devc->triggerslope = (trigger_slopes[idx][0] == 'r')
? SLOPE_POSITIVE : SLOPE_NEGATIVE;
break;
case SR_CONF_HORIZ_TRIGGERPOS:
devc->triggerposition = tmp_double;
break;
case SR_CONF_BUFFERSIZE:
- tmp_u64 = g_variant_get_uint64(data);
- for (i = 0; i < NUM_BUFFER_SIZES; i++) {
- if (devc->profile->buffersizes[i] == tmp_u64) {
- devc->framesize = tmp_u64;
- break;
- }
- }
- if (i == NUM_BUFFER_SIZES)
+ if ((idx = std_u64_idx(data, devc->profile->buffersizes, NUM_BUFFER_SIZES)) < 0)
return SR_ERR_ARG;
+ devc->framesize = devc->profile->buffersizes[idx];
break;
case SR_CONF_TIMEBASE:
- g_variant_get(data, "(tt)", &p, &q);
- tmp_int = -1;
- for (i = 0; i < ARRAY_SIZE(timebases); i++) {
- if (timebases[i][0] == p && timebases[i][1] == q) {
- tmp_int = i;
- break;
- }
- }
- if (tmp_int >= 0)
- devc->timebase = tmp_int;
- else
+ if ((idx = std_u64_tuple_idx(data, ARRAY_AND_SIZE(timebases))) < 0)
return SR_ERR_ARG;
+ devc->timebase = idx;
break;
case SR_CONF_TRIGGER_SOURCE:
- tmp_str = g_variant_get_string(data, NULL);
- for (i = 0; trigger_sources[i]; i++) {
- if (!strcmp(tmp_str, trigger_sources[i])) {
- devc->triggersource = g_strdup(tmp_str);
- break;
- }
- }
- if (trigger_sources[i] == 0)
+ if ((idx = std_str_idx(data, ARRAY_AND_SIZE(trigger_sources))) < 0)
return SR_ERR_ARG;
+ devc->triggersource = g_strdup(trigger_sources[idx]);
break;
default:
return SR_ERR_NA;
devc->filter[ch_idx] = g_variant_get_boolean(data);
break;
case SR_CONF_VDIV:
- g_variant_get(data, "(tt)", &p, &q);
- tmp_int = -1;
- for (i = 0; i < ARRAY_SIZE(vdivs); i++) {
- if (vdivs[i][0] == p && vdivs[i][1] == q) {
- tmp_int = i;
- break;
- }
- }
- if (tmp_int >= 0) {
- devc->voltage[ch_idx] = tmp_int;
- } else
+ if ((idx = std_u64_tuple_idx(data, ARRAY_AND_SIZE(vdivs))) < 0)
return SR_ERR_ARG;
+ devc->voltage[ch_idx] = idx;
break;
case SR_CONF_COUPLING:
- tmp_str = g_variant_get_string(data, NULL);
- for (i = 0; coupling[i]; i++) {
- if (!strcmp(tmp_str, coupling[i])) {
- devc->coupling[ch_idx] = i;
- break;
- }
- }
- if (coupling[i] == 0)
+ if ((idx = std_str_idx(data, ARRAY_AND_SIZE(coupling))) < 0)
return SR_ERR_ARG;
+ devc->coupling[ch_idx] = idx;
break;
default:
return SR_ERR_NA;
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)
{
struct dev_context *devc;
*data = std_gvar_array_u64(devc->profile->buffersizes, NUM_BUFFER_SIZES);
break;
case SR_CONF_TIMEBASE:
- *data = std_gvar_tuple_array(&timebases, ARRAY_SIZE(timebases));
+ *data = std_gvar_tuple_array(ARRAY_AND_SIZE(timebases));
break;
case SR_CONF_TRIGGER_SOURCE:
- *data = g_variant_new_strv(trigger_sources,
- ARRAY_SIZE(trigger_sources));
+ *data = g_variant_new_strv(ARRAY_AND_SIZE(trigger_sources));
break;
case SR_CONF_TRIGGER_SLOPE:
- *data = g_variant_new_strv(trigger_slopes,
- ARRAY_SIZE(trigger_slopes));
+ *data = g_variant_new_strv(ARRAY_AND_SIZE(trigger_slopes));
break;
default:
return SR_ERR_NA;
} else {
switch (key) {
case SR_CONF_DEVICE_OPTIONS:
- *data = std_gvar_array_u32(devopts_cg, ARRAY_SIZE(devopts_cg));
+ *data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg));
break;
case SR_CONF_COUPLING:
- *data = g_variant_new_strv(coupling, ARRAY_SIZE(coupling));
+ *data = g_variant_new_strv(ARRAY_AND_SIZE(coupling));
break;
case SR_CONF_VDIV:
- *data = std_gvar_tuple_array(&vdivs, ARRAY_SIZE(vdivs));
+ *data = std_gvar_tuple_array(ARRAY_AND_SIZE(vdivs));
break;
default:
return SR_ERR_NA;