/*
* This file is part of the libsigrok project.
*
- * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2014 Bert Vermeulen <bert@biot.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
};
/**
- * Returns a NULL-terminated list of all the available output modules.
+ * Returns a NULL-terminated list of all available output modules.
*
* @since 0.4.0
*/
*
* @since 0.4.0
*/
-SR_API const struct sr_option *sr_output_options_get(const struct sr_output_module *o)
+SR_API const struct sr_option **sr_output_options_get(const struct sr_output_module *o)
{
+ const struct sr_option *mod_opts, **opts;
+ int size, i;
if (!o || !o->options)
return NULL;
- return o->options(FALSE);
+ mod_opts = o->options();
+
+ for (size = 0; mod_opts[size].id; size++)
+ ;
+ opts = g_malloc((size + 1) * sizeof(struct sr_option *));
+
+ for (i = 0; i < size; i++)
+ opts[i] = &mod_opts[i];
+ opts[i] = NULL;
+
+ return opts;
}
/**
* After a call to sr_output_options_get(), this function cleans up all
- * the resources allocated by that call.
+ * resources returned by that call.
*
* @since 0.4.0
*/
-SR_API void sr_output_options_free(const struct sr_output_module *o)
+SR_API void sr_output_options_free(const struct sr_option **options)
{
- struct sr_option *opt;
+ int i;
- if (!o || !o->options)
+ if (!options)
return;
- for (opt = o->options(TRUE); opt->id; opt++) {
- if (opt->def) {
- g_variant_unref(opt->def);
- opt->def = NULL;
+ for (i = 0; options[i]; i++) {
+ if (options[i]->def) {
+ g_variant_unref(options[i]->def);
+ ((struct sr_option *)options[i])->def = NULL;
}
- if (opt->values) {
- g_slist_free_full(opt->values, (GDestroyNotify)g_variant_unref);
- opt->values = NULL;
+ if (options[i]->values) {
+ g_slist_free_full(options[i]->values, (GDestroyNotify)g_variant_unref);
+ ((struct sr_option *)options[i])->values = NULL;
}
}
+ g_free(options);
}
/**
GHashTable *options, const struct sr_dev_inst *sdi)
{
struct sr_output *op;
+ const struct sr_option *mod_opts;
+ const GVariantType *gvt;
+ GHashTable *new_opts;
+ GHashTableIter iter;
+ gpointer key, value;
+ int i;
op = g_malloc(sizeof(struct sr_output));
op->module = o;
op->sdi = sdi;
- if (op->module->init && op->module->init(op, options) != SR_OK) {
+
+ new_opts = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
+ (GDestroyNotify)g_variant_unref);
+ if (o->options) {
+ mod_opts = o->options();
+ for (i = 0; mod_opts[i].id; i++) {
+ if (options && g_hash_table_lookup_extended(options,
+ mod_opts[i].id, &key, &value)) {
+ /* Pass option along. */
+ gvt = g_variant_get_type(mod_opts[i].def);
+ if (!g_variant_is_of_type(value, gvt)) {
+ sr_err("Invalid type for '%s' option.", key);
+ g_free(op);
+ return NULL;
+ }
+ g_hash_table_insert(new_opts, g_strdup(mod_opts[i].id),
+ g_variant_ref(value));
+ } else {
+ /* Option not given: insert the default value. */
+ g_hash_table_insert(new_opts, g_strdup(mod_opts[i].id),
+ g_variant_ref(mod_opts[i].def));
+ }
+ }
+
+ /* Make sure no invalid options were given. */
+ if (options) {
+ g_hash_table_iter_init(&iter, options);
+ while (g_hash_table_iter_next(&iter, &key, &value)) {
+ if (!g_hash_table_lookup(new_opts, key)) {
+ sr_err("Output module '%s' has no option '%s'", o->id, key);
+ g_hash_table_destroy(new_opts);
+ g_free(op);
+ return NULL;
+ }
+ }
+ }
+ }
+
+ if (op->module->init && op->module->init(op, new_opts) != SR_OK) {
g_free(op);
op = NULL;
}
+ if (new_opts)
+ g_hash_table_destroy(new_opts);
return op;
}