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

Add new sr_dev_config_capabilities() helper function.

This commit is contained in:
Martin Ling 2015-11-02 21:35:26 +00:00 committed by Uwe Hermann
parent 12f2f640cb
commit 71e9c54dab
2 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libsigrok/proto.h
View File

@ -56,6 +56,8 @@ SR_API int sr_dev_channel_name_set(struct sr_channel *channel,
SR_API int sr_dev_channel_enable(struct sr_channel *channel,
gboolean state);
SR_API gboolean sr_dev_has_option(const struct sr_dev_inst *sdi, int key);
SR_API int sr_dev_config_capabilities(const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg, int key);
SR_API GSList *sr_dev_list(const struct sr_dev_driver *driver);
SR_API int sr_dev_clear(const struct sr_dev_driver *driver);
SR_API int sr_dev_open(struct sr_dev_inst *sdi);

46
src/device.c
View File

@ -196,6 +196,52 @@ SR_API gboolean sr_dev_has_option(const struct sr_dev_inst *sdi, int key)
return ret;
}
/**
* Enumerate the configuration capabilities supported by a device instance
* for a given configuration key.
*
* @param sdi Pointer to the device instance to be checked. Must not be NULL.
* If the device's 'driver' field is NULL (virtual device), this
* function will always return FALSE (virtual devices don't have
* a hardware capabilities list).
* @param cg Pointer to a channel group, if a specific channel group is to
* be checked. Must be NULL to check device-wide options.
* @param[in] key The option that should be checked for is supported by the
* specified device.
*
* @retval A bitmask of enum sr_configcap values, which will be zero for
* invalid inputs or if the key is unsupported.
*
* @since 0.4.0
*/
SR_API int sr_dev_config_capabilities(const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg, const int key)
{
GVariant *gvar;
const int *devopts;
gsize num_opts, i;
int ret;
if (!sdi || !sdi->driver || !sdi->driver->config_list)
return 0;
if (sdi->driver->config_list(SR_CONF_DEVICE_OPTIONS,
&gvar, sdi, cg) != SR_OK)
return 0;
ret = 0;
devopts = g_variant_get_fixed_array(gvar, &num_opts, sizeof(int32_t));
for (i = 0; i < num_opts; i++) {
if ((devopts[i] & SR_CONF_MASK) == key) {
ret = devopts[i] & ~SR_CONF_MASK;
break;
}
}
g_variant_unref(gvar);
return ret;
}
/**
* Allocate and init a new user-generated device instance.
*