SR_CONF_BUFFERSIZE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
};
-static const uint32_t cgopts[] = {
+static const uint32_t devopts_cg[] = {
SR_CONF_VDIV | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
SR_CONF_COUPLING | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
SR_CONF_PROBE_FACTOR | SR_CONF_GET | SR_CONF_SET,
return std_scan_complete(di, devices);
}
-static void clear_helper(void *priv)
+static void clear_helper(struct dev_context *devc)
{
- struct dev_context *devc = priv;
-
g_slist_free(devc->enabled_channel);
}
}
}
- return std_dev_clear_with_callback(di, clear_helper);
+ return std_dev_clear_with_callback(di, (std_dev_clear_callback)clear_helper);
}
static int dev_open(struct sr_dev_inst *sdi)
return i;
}
-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 = sdi->priv;
struct parport *port;
- int ret, i, ch = -1;
+ int i, ch = -1;
if (cg) /* sr_config_get will validate cg using config_list */
ch = ((struct sr_channel *)cg->channels->data)->index;
- ret = SR_OK;
switch (key) {
case SR_CONF_CONN:
port = sdi->conn;
*data = g_variant_new_uint64(samplerates[devc->rate]);
break;
case SR_CONF_TRIGGER_SOURCE:
- i = reverse_map(devc->cctl[0] & 0xC0, trigger_sources_map,
- ARRAY_SIZE(trigger_sources_map));
+ i = reverse_map(devc->cctl[0] & 0xC0, ARRAY_AND_SIZE(trigger_sources_map));
if (i == -1)
- ret = SR_ERR;
+ return SR_ERR;
else
*data = g_variant_new_string(trigger_sources[i]);
break;
case SR_CONF_TRIGGER_SLOPE:
if (devc->edge >= ARRAY_SIZE(trigger_slopes))
- ret = SR_ERR;
+ return SR_ERR;
else
*data = g_variant_new_string(trigger_slopes[devc->edge]);
break;
break;
case SR_CONF_VDIV:
if (ch == -1) {
- ret = SR_ERR_CHANNEL_GROUP;
+ return SR_ERR_CHANNEL_GROUP;
} else {
- i = reverse_map(devc->cctl[ch] & 0x33, vdivs_map,
- ARRAY_SIZE(vdivs_map));
+ i = reverse_map(devc->cctl[ch] & 0x33, ARRAY_AND_SIZE(vdivs_map));
if (i == -1)
- ret = SR_ERR;
+ return SR_ERR;
else
*data = g_variant_new("(tt)", vdivs[i][0],
vdivs[i][1]);
break;
case SR_CONF_COUPLING:
if (ch == -1) {
- ret = SR_ERR_CHANNEL_GROUP;
+ return SR_ERR_CHANNEL_GROUP;
} else {
- i = reverse_map(devc->cctl[ch] & 0x0C, coupling_map,
- ARRAY_SIZE(coupling_map));
+ i = reverse_map(devc->cctl[ch] & 0x0C, ARRAY_AND_SIZE(coupling_map));
if (i == -1)
- ret = SR_ERR;
+ return SR_ERR;
else
*data = g_variant_new_string(coupling[i]);
}
break;
case SR_CONF_PROBE_FACTOR:
if (ch == -1)
- ret = SR_ERR_CHANNEL_GROUP;
+ return SR_ERR_CHANNEL_GROUP;
else
*data = g_variant_new_uint64(devc->probe[ch]);
break;
default:
- ret = SR_ERR_NA;
+ return SR_ERR_NA;
}
- return ret;
+ 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 = sdi->priv;
- int ret, i, ch = -1;
+ int i, ch = -1;
uint64_t u, v;
if (cg) /* sr_config_set will validate cg using config_list */
ch = ((struct sr_channel *)cg->channels->data)->index;
- ret = SR_OK;
switch (key) {
case SR_CONF_LIMIT_FRAMES:
devc->frame_limit = g_variant_get_uint64(data);
break;
case SR_CONF_SAMPLERATE:
i = find_in_array(data, G_VARIANT_TYPE_UINT64,
- samplerates, ARRAY_SIZE(samplerates));
+ ARRAY_AND_SIZE(samplerates));
if (i == -1)
- ret = SR_ERR_ARG;
+ return SR_ERR_ARG;
else
devc->rate = i;
break;
case SR_CONF_TRIGGER_SOURCE:
i = find_in_array(data, G_VARIANT_TYPE_STRING,
- trigger_sources, ARRAY_SIZE(trigger_sources));
+ ARRAY_AND_SIZE(trigger_sources));
if (i == -1)
- ret = SR_ERR_ARG;
+ return SR_ERR_ARG;
else
devc->cctl[0] = (devc->cctl[0] & 0x3F)
| trigger_sources_map[i];
break;
case SR_CONF_TRIGGER_SLOPE:
i = find_in_array(data, G_VARIANT_TYPE_STRING,
- trigger_slopes, ARRAY_SIZE(trigger_slopes));
+ ARRAY_AND_SIZE(trigger_slopes));
if (i == -1)
- ret = SR_ERR_ARG;
+ return SR_ERR_ARG;
else
devc->edge = i;
break;
case SR_CONF_BUFFERSIZE:
i = find_in_array(data, G_VARIANT_TYPE_UINT64,
- buffersizes, ARRAY_SIZE(buffersizes));
+ ARRAY_AND_SIZE(buffersizes));
if (i == -1)
- ret = SR_ERR_ARG;
+ return SR_ERR_ARG;
else
devc->last_step = i;
break;
case SR_CONF_VDIV:
if (ch == -1) {
- ret = SR_ERR_CHANNEL_GROUP;
+ return SR_ERR_CHANNEL_GROUP;
} else if (!g_variant_is_of_type(data, G_VARIANT_TYPE("(tt)"))) {
- ret = SR_ERR_ARG;
+ return SR_ERR_ARG;
} else {
g_variant_get(data, "(tt)", &u, &v);
for (i = 0; i < (int)ARRAY_SIZE(vdivs); i++)
if (vdivs[i][0] == u && vdivs[i][1] == v)
break;
if (i == ARRAY_SIZE(vdivs))
- ret = SR_ERR_ARG;
+ return SR_ERR_ARG;
else
devc->cctl[ch] = (devc->cctl[ch] & 0xCC)
| vdivs_map[i];
break;
case SR_CONF_COUPLING:
if (ch == -1) {
- ret = SR_ERR_CHANNEL_GROUP;
+ return SR_ERR_CHANNEL_GROUP;
} else {
i = find_in_array(data, G_VARIANT_TYPE_STRING,
- coupling, ARRAY_SIZE(coupling));
+ ARRAY_AND_SIZE(coupling));
if (i == -1)
- ret = SR_ERR_ARG;
+ return SR_ERR_ARG;
else
devc->cctl[ch] = (devc->cctl[ch] & 0xF3)
| coupling_map[i];
break;
case SR_CONF_PROBE_FACTOR:
if (ch == -1) {
- ret = SR_ERR_CHANNEL_GROUP;
+ return SR_ERR_CHANNEL_GROUP;
} else {
u = g_variant_get_uint64(data);
if (!u)
- ret = SR_ERR_ARG;
+ return SR_ERR_ARG;
else
devc->probe[ch] = u;
}
break;
default:
- ret = SR_ERR_NA;
+ return SR_ERR_NA;
}
- return ret;
+ return SR_OK;
}
static int config_channel_set(const struct sr_dev_inst *sdi,
- struct sr_channel *ch,
- unsigned int changes)
+ struct sr_channel *ch, unsigned int changes)
{
struct dev_context *devc = sdi->priv;
uint8_t v;
return hung_chang_dso_2100_move_to(sdi, state);
}
-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)
{
- GVariantBuilder gvb;
- GVariant *gvar, *rational[2];
GSList *l;
- int i;
switch (key) {
- case SR_CONF_SCAN_OPTIONS:
+ case SR_CONF_SCAN_OPTIONS:
case SR_CONF_DEVICE_OPTIONS:
break;
case SR_CONF_SAMPLERATE:
switch (key) {
case SR_CONF_SCAN_OPTIONS:
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
- scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
- break;
+ return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, NULL, NULL);
case SR_CONF_DEVICE_OPTIONS:
- if (!sdi)
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
- drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
- else if (!cg)
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
- devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
- else
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
- cgopts, ARRAY_SIZE(cgopts), sizeof(uint32_t));
+ if (!cg)
+ return STD_CONFIG_LIST(key, data, sdi, cg, NULL, drvopts, devopts);
+ *data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg));
break;
case SR_CONF_SAMPLERATE:
- g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));
- gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"),
- samplerates, ARRAY_SIZE(samplerates), sizeof(uint64_t));
- g_variant_builder_add(&gvb, "{sv}", "samplerates", gvar);
- *data = g_variant_builder_end(&gvb);
+ *data = std_gvar_samplerates(ARRAY_AND_SIZE(samplerates));
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;
case SR_CONF_BUFFERSIZE:
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT64,
- buffersizes, ARRAY_SIZE(buffersizes), sizeof(uint64_t));
+ *data = std_gvar_array_u64(ARRAY_AND_SIZE(buffersizes));
break;
case SR_CONF_VDIV:
- g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
- for (i = 0; i < (int)ARRAY_SIZE(vdivs); i++) {
- rational[0] = g_variant_new_uint64(vdivs[i][0]);
- rational[1] = g_variant_new_uint64(vdivs[i][1]);
- gvar = g_variant_new_tuple(rational, 2);
- g_variant_builder_add_value(&gvb, gvar);
- }
- *data = g_variant_builder_end(&gvb);
+ *data = std_gvar_tuple_array(ARRAY_AND_SIZE(vdivs));
break;
case SR_CONF_COUPLING:
- *data = g_variant_new_strv(coupling, ARRAY_SIZE(coupling));
+ *data = g_variant_new_strv(ARRAY_AND_SIZE(coupling));
break;
}
projects / libsigrok.git / blobdiff