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

atten-pps3xxx: Publish driver options.

This commit is contained in:
Bert Vermeulen 2014-10-26 23:33:46 +01:00
parent a700a3a4bf
commit d6fa8ace94
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/hardware/atten-pps3xxx/api.c
View File

@ -36,9 +36,12 @@ static const uint32_t scanopts[] = {
SR_CONF_SERIALCOMM, SR_CONF_SERIALCOMM,
}; };
static const uint32_t devopts[] = { static const uint32_t devopts_drv[] = {
SR_CONF_POWER_SUPPLY, SR_CONF_POWER_SUPPLY,
SR_CONF_CONTINUOUS, SR_CONF_CONTINUOUS,
};
static const uint32_t devopts_global[] = {
SR_CONF_OUTPUT_CHANNEL_CONFIG | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, SR_CONF_OUTPUT_CHANNEL_CONFIG | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
SR_CONF_OVER_CURRENT_PROTECTION_ENABLED | SR_CONF_GET | SR_CONF_SET, SR_CONF_OVER_CURRENT_PROTECTION_ENABLED | SR_CONF_GET | SR_CONF_SET,
}; };
@ -368,24 +371,30 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
GVariantBuilder gvb; GVariantBuilder gvb;
int channel, ret, i; int channel, ret, i;
/* Always available, even without sdi. */ /* Always available. */
if (key == SR_CONF_SCAN_OPTIONS) { if (key == SR_CONF_SCAN_OPTIONS) {
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t)); scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
return SR_OK; return SR_OK;
} }
if (key == SR_CONF_DEVICE_OPTIONS && !sdi) {
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
devopts_drv, ARRAY_SIZE(devopts_drv), sizeof(uint32_t));
return SR_OK;
}
if (!sdi) if (!sdi)
return SR_ERR_ARG; return SR_ERR_ARG;
devc = sdi->priv;
devc = sdi->priv;
ret = SR_OK; ret = SR_OK;
if (!cg) { if (!cg) {
/* No channel group: global options. */ /* No channel group: global options. */
switch (key) { switch (key) {
case SR_CONF_DEVICE_OPTIONS: case SR_CONF_DEVICE_OPTIONS:
*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)); devopts_global, ARRAY_SIZE(devopts_global), sizeof(uint32_t));
break; break;
case SR_CONF_OUTPUT_CHANNEL_CONFIG: case SR_CONF_OUTPUT_CHANNEL_CONFIG:
if (devc->model->channel_modes == CHANMODE_INDEPENDENT) { if (devc->model->channel_modes == CHANMODE_INDEPENDENT) {