return ret;
}
+static int check_options(struct sr_dev_driver *driver, GSList *options,
+ uint32_t optlist_key, struct sr_dev_inst *sdi,
+ struct sr_channel_group *cg)
+{
+ struct sr_config *src;
+ const struct sr_config_info *srci;
+ GVariant *gvar_opts;
+ GSList *l;
+ const uint32_t *opts;
+ gsize num_opts, i;
+ int ret;
+
+ if (sr_config_list(driver, sdi, cg, optlist_key, &gvar_opts) != SR_OK) {
+ /* Driver publishes no options for this optlist. */
+ return SR_ERR;
+ }
+
+ ret = SR_OK;
+ opts = g_variant_get_fixed_array(gvar_opts, &num_opts, sizeof(uint32_t));
+ for (l = options; l; l = l->next) {
+ src = l->data;
+ for (i = 0; i < num_opts; i++) {
+ if (opts[i] == src->key)
+ break;
+ }
+ if (i == num_opts) {
+ if (!(srci = sr_config_info_get(src->key)))
+ /* Shouldn't happen. */
+ sr_err("Invalid option %d.", src->key);
+ else
+ sr_err("Invalid option '%s'.", srci->id);
+ ret = SR_ERR_ARG;
+ break;
+ }
+ if (sr_variant_type_check(src->key, src->data) != SR_OK) {
+ ret = SR_ERR_ARG;
+ break;
+ }
+ }
+ g_variant_unref(gvar_opts);
+
+ return ret;
+}
+
/**
* Tell a hardware driver to scan for devices.
*
*/
SR_API GSList *sr_driver_scan(struct sr_dev_driver *driver, GSList *options)
{
- struct sr_config *src;
- const struct sr_config_info *srci;
GSList *l;
- GVariant *gvar_opts;
- const uint32_t *opts;
- gsize num_opts, i;
- int ret;
if (!driver) {
sr_err("Invalid driver, can't scan for devices.");
return NULL;
}
- ret = sr_config_list(driver, NULL, NULL, SR_CONF_SCAN_OPTIONS, &gvar_opts);
- if (ret != SR_OK && options) {
- /* Driver publishes no scan options but some were given. */
- sr_err("Driver does not support scan options.");
- return NULL;
- }
- opts = g_variant_get_fixed_array(gvar_opts, &num_opts, sizeof(uint32_t));
- for (l = options; l; l = l->next) {
- src = l->data;
- for (i = 0; i < num_opts; i++) {
- if (opts[i] == src->key)
- break;
- }
- if (i == num_opts) {
- if (!(srci = sr_config_info_get(src->key)))
- sr_err("Driver does not support scan option %d.", src->key);
- else
- sr_err("Driver does not support scan option '%s'.", srci->id);
- g_variant_unref(gvar_opts);
+ if (options) {
+ if (check_options(driver, options, SR_CONF_SCAN_OPTIONS, NULL, NULL) != SR_OK)
return NULL;
- }
- if (sr_variant_type_check(src->key, src->data) != SR_OK) {
- g_variant_unref(gvar_opts);
- return NULL;
- }
}
- g_variant_unref(gvar_opts);
l = driver->scan(options);
}
+static int check_key(const struct sr_dev_driver *driver,
+ const struct sr_dev_inst *sdi, const struct sr_channel_group *cg,
+ uint32_t key, int op)
+{
+ const struct sr_config_info *srci;
+ gsize num_opts, i;
+ GVariant *gvar_opts;
+ const uint32_t *opts;
+ uint32_t pub_opt;
+ char *suffix, *opstr;
+
+ if (sdi && cg)
+ suffix = " for this device and channel group";
+ else if (sdi)
+ suffix = " for this device";
+ else
+ suffix = "";
+
+ if (!(srci = sr_config_info_get(key))) {
+ sr_err("Invalid key %d.", key);
+ return SR_ERR_ARG;
+ }
+ opstr = op == SR_CONF_GET ? "get" : op == SR_CONF_SET ? "set" : "list";
+ sr_spew("sr_config_%s(): key %d (%s) sdi %p cg %s", opstr, key,
+ srci->id, sdi, cg ? cg->name : "NULL");
+
+ if (sr_config_list(driver, sdi, cg, SR_CONF_DEVICE_OPTIONS, &gvar_opts) != SR_OK) {
+ /* Driver publishes no options. */
+ sr_err("No options available%s.", srci->id, suffix);
+ return SR_ERR_ARG;
+ }
+ opts = g_variant_get_fixed_array(gvar_opts, &num_opts, sizeof(uint32_t));
+ pub_opt = 0;
+ for (i = 0; i < num_opts; i++) {
+ if ((opts[i] & SR_CONF_MASK) == key) {
+ pub_opt = opts[i];
+ break;
+ }
+ }
+ g_variant_unref(gvar_opts);
+ if (!pub_opt) {
+ sr_err("Option '%s' not available%s.", srci->id, suffix);
+ return SR_ERR_ARG;
+ }
+
+ if (!(pub_opt & op)) {
+ sr_err("Option '%s' not available to %s%s.", srci->id, opstr, suffix);
+ return SR_ERR_ARG;
+ }
+
+ return SR_OK;
+}
+
/**
* Query value of a configuration key at the given driver or device instance.
*
if (!driver->config_get)
return SR_ERR_ARG;
+ if (check_key(driver, sdi, cg, key, SR_CONF_GET) != SR_OK)
+ return SR_ERR_ARG;
+
if ((ret = driver->config_get(key, data, sdi, cg)) == SR_OK) {
/* Got a floating reference from the driver. Sink it here,
* caller will need to unref when done with it. */
ret = SR_ERR;
else if (!sdi->driver->config_set)
ret = SR_ERR_ARG;
+ else if (check_key(sdi->driver, sdi, cg, key, SR_CONF_SET) != SR_OK)
+ return SR_ERR_ARG;
else if ((ret = sr_variant_type_check(key, data)) == SR_OK)
ret = sdi->driver->config_set(key, data, sdi, cg);
int ret;
if (!driver || !data)
- ret = SR_ERR;
+ return SR_ERR;
else if (!driver->config_list)
- ret = SR_ERR_ARG;
- else if ((ret = driver->config_list(key, data, sdi, cg)) == SR_OK)
+ return SR_ERR_ARG;
+ else if (key != SR_CONF_SCAN_OPTIONS && key != SR_CONF_DEVICE_OPTIONS) {
+ if (check_key(driver, sdi, cg, key, SR_CONF_LIST) != SR_OK)
+ return SR_ERR_ARG;
+ }
+ if ((ret = driver->config_list(key, data, sdi, cg)) == SR_OK)
g_variant_ref_sink(*data);
return ret;