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

agilent-dmm: Now really fix driver options.

This commit is contained in:
Bert Vermeulen 2014-11-18 17:31:58 +01:00
parent 42a47a9a4b
commit f9dada0b60
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/hardware/agilent-dmm/api.c
View File

@ -32,9 +32,12 @@ static const uint32_t scanopts[] = {
SR_CONF_SERIALCOMM, SR_CONF_SERIALCOMM,
}; };
static const uint32_t devopts[] = { static const uint32_t drvopts[] = {
SR_CONF_MULTIMETER, SR_CONF_MULTIMETER,
SR_CONF_CONTINUOUS, };
static const uint32_t devopts[] = {
SR_CONF_CONTINUOUS | SR_CONF_SET,
SR_CONF_LIMIT_SAMPLES | SR_CONF_SET, SR_CONF_LIMIT_SAMPLES | SR_CONF_SET,
SR_CONF_LIMIT_MSEC | SR_CONF_SET, SR_CONF_LIMIT_MSEC | SR_CONF_SET,
}; };
@ -231,10 +234,10 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
case SR_CONF_DEVICE_OPTIONS: case SR_CONF_DEVICE_OPTIONS:
if (!sdi) if (!sdi)
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
devopts, ARRAY_SIZE(devopts), sizeof(uint32_t)); drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
else else
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
devopts, 0, sizeof(uint32_t)); devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
break; break;
default: default:
return SR_ERR_NA; return SR_ERR_NA;