BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rigol-ds1xx2: Better error reporting when probe groups are required

This commit is contained in:
Bert Vermeulen 2013-11-03 14:13:59 +01:00 committed by Uwe Hermann
parent 78bcc55afa
commit be60a9e4a9
1 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
hardware/rigol-ds1xx2/api.c
View File

@ -393,11 +393,24 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
if (!sdi || !(devc = sdi->priv)) if (!sdi || !(devc = sdi->priv))
return SR_ERR_ARG; return SR_ERR_ARG;
/* If a probe group is specified, it must be a valid one. */
if (probe_group) {
if (probe_group != &devc->analog_groups[0]
&& probe_group != &devc->analog_groups[1]) {
sr_err("Invalid probe group specified.");
return SR_ERR;
}
}
switch (id) { switch (id) {
case SR_CONF_NUM_TIMEBASE: case SR_CONF_NUM_TIMEBASE:
*data = g_variant_new_int32(NUM_TIMEBASE); *data = g_variant_new_int32(NUM_TIMEBASE);
break; break;
case SR_CONF_NUM_VDIV: case SR_CONF_NUM_VDIV:
if (!probe_group) {
sr_err("No probe group specified.");
return SR_ERR_PROBE_GROUP;
}
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
if (probe_group == &devc->analog_groups[i]) { if (probe_group == &devc->analog_groups[i]) {
*data = g_variant_new_int32(NUM_VDIV); *data = g_variant_new_int32(NUM_VDIV);
@ -428,6 +441,15 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
if (sdi->status != SR_ST_ACTIVE) if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED; return SR_ERR_DEV_CLOSED;
/* If a probe group is specified, it must be a valid one. */
if (probe_group) {
if (probe_group != &devc->analog_groups[0]
&& probe_group != &devc->analog_groups[1]) {
sr_err("Invalid probe group specified.");
return SR_ERR;
}
}
ret = SR_OK; ret = SR_OK;
switch (id) { switch (id) {
case SR_CONF_LIMIT_FRAMES: case SR_CONF_LIMIT_FRAMES:
@ -485,6 +507,10 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
ret = SR_ERR_ARG; ret = SR_ERR_ARG;
break; break;
case SR_CONF_VDIV: case SR_CONF_VDIV:
if (!probe_group) {
sr_err("No probe group specified.");
return SR_ERR_PROBE_GROUP;
}
g_variant_get(data, "(tt)", &p, &q); g_variant_get(data, "(tt)", &p, &q);
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
if (probe_group == &devc->analog_groups[i]) { if (probe_group == &devc->analog_groups[i]) {
@ -549,9 +575,22 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
if (!sdi || !(devc = sdi->priv)) if (!sdi || !(devc = sdi->priv))
return SR_ERR_ARG; return SR_ERR_ARG;
/* If a probe group is specified, it must be a valid one. */
if (probe_group) {
if (probe_group != &devc->analog_groups[0]
&& probe_group != &devc->analog_groups[1]) {
sr_err("Invalid probe group specified.");
return SR_ERR;
}
}
switch (key) { switch (key) {
break; break;
case SR_CONF_DEVICE_OPTIONS: case SR_CONF_DEVICE_OPTIONS:
if (!probe_group) {
sr_err("No probe group specified.");
return SR_ERR_PROBE_GROUP;
}
if (probe_group == &devc->digital_group) { if (probe_group == &devc->digital_group) {
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
NULL, 0, sizeof(int32_t)); NULL, 0, sizeof(int32_t));
@ -572,6 +611,9 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
*data = g_variant_new_strv(coupling, ARRAY_SIZE(coupling)); *data = g_variant_new_strv(coupling, ARRAY_SIZE(coupling));
return SR_OK; return SR_OK;
} }
if (!probe_group) {
sr_err("No probe group specified.");
return SR_ERR_PROBE_GROUP;
} }
return SR_ERR_NA; return SR_ERR_NA;
case SR_CONF_VDIV: case SR_CONF_VDIV:
@ -582,6 +624,9 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
*data = g_variant_new_tuple(rational, 2); *data = g_variant_new_tuple(rational, 2);
return SR_OK; return SR_OK;
} }
if (!probe_group) {
sr_err("No probe group specified.");
return SR_ERR_PROBE_GROUP;
} }
return SR_ERR_NA; return SR_ERR_NA;
case SR_CONF_TIMEBASE: case SR_CONF_TIMEBASE: