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

atten-pps3xxx: Fix options reporting.

This commit is contained in:
Bert Vermeulen 2014-01-13 02:10:11 +01:00
parent fe997353bf
commit e22aa87808
1 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hardware/atten-pps3xxx/api.c
View File

@ -31,7 +31,7 @@
*/ */
#define SERIALCOMM "9600/8n2" #define SERIALCOMM "9600/8n2"
static const int32_t hwopts[] = { static const int32_t scanopts[] = {
SR_CONF_CONN, SR_CONF_CONN,
SR_CONF_SERIALCOMM, SR_CONF_SERIALCOMM,
}; };
@ -39,18 +39,11 @@ static const int32_t hwopts[] = {
static const int32_t devopts[] = { static const int32_t devopts[] = {
SR_CONF_POWER_SUPPLY, SR_CONF_POWER_SUPPLY,
SR_CONF_CONTINUOUS, SR_CONF_CONTINUOUS,
};
static const int32_t devopts_sdi[] = {
SR_CONF_POWER_SUPPLY,
SR_CONF_CONTINUOUS,
SR_CONF_OUTPUT_CHANNEL, SR_CONF_OUTPUT_CHANNEL,
SR_CONF_OVER_CURRENT_PROTECTION, SR_CONF_OVER_CURRENT_PROTECTION,
}; };
static const int32_t devopts_pg[] = { static const int32_t devopts_pg[] = {
SR_CONF_POWER_SUPPLY,
SR_CONF_CONTINUOUS,
SR_CONF_OUTPUT_VOLTAGE, SR_CONF_OUTPUT_VOLTAGE,
SR_CONF_OUTPUT_VOLTAGE_MAX, SR_CONF_OUTPUT_VOLTAGE_MAX,
SR_CONF_OUTPUT_CURRENT, SR_CONF_OUTPUT_CURRENT,
@ -382,21 +375,12 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
/* Always available, even without sdi. */ /* Always available, even without sdi. */
if (key == SR_CONF_SCAN_OPTIONS) { if (key == SR_CONF_SCAN_OPTIONS) {
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
hwopts, ARRAY_SIZE(hwopts), sizeof(int32_t)); scanopts, ARRAY_SIZE(scanopts), sizeof(int32_t));
return SR_OK; return SR_OK;
} }
if (!sdi) { if (!sdi)
if (key == SR_CONF_DEVICE_OPTIONS) {
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
devopts, ARRAY_SIZE(devopts), sizeof(int32_t));
return SR_OK;
} else {
/* Everything else needs an sdi. */
return SR_ERR_ARG; return SR_ERR_ARG;
}
}
devc = sdi->priv; devc = sdi->priv;
ret = SR_OK; ret = SR_OK;
@ -405,7 +389,7 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
switch (key) { switch (key) {
case SR_CONF_DEVICE_OPTIONS: case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
devopts_sdi, ARRAY_SIZE(devopts_sdi), sizeof(int32_t)); devopts, ARRAY_SIZE(devopts), sizeof(int32_t));
break; break;
case SR_CONF_OUTPUT_CHANNEL: case SR_CONF_OUTPUT_CHANNEL:
if (devc->model->channel_modes == CHANMODE_INDEPENDENT) { if (devc->model->channel_modes == CHANMODE_INDEPENDENT) {