* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <config.h>
#include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h"
+/** @cond PRIVATE */
#define LOG_PREFIX "output"
+/** @endcond */
/**
* @file
* Output module handling.
*
* libsigrok supports several output modules for file formats such as binary,
- * VCD, gnuplot, and so on. It provides an output API that frontends can use.
+ * VCD, csv, and so on. It provides an output API that frontends can use.
* New output modules can be added/implemented in libsigrok without having
* to change the frontends at all.
*
extern SR_PRIV struct sr_output_module output_binary;
extern SR_PRIV struct sr_output_module output_vcd;
extern SR_PRIV struct sr_output_module output_ols;
-extern SR_PRIV struct sr_output_module output_gnuplot;
extern SR_PRIV struct sr_output_module output_chronovu_la8;
extern SR_PRIV struct sr_output_module output_csv;
extern SR_PRIV struct sr_output_module output_analog;
&output_binary,
&output_bits,
&output_csv,
- &output_gnuplot,
&output_hex,
&output_ols,
&output_vcd,
return omod->exts;
}
+/*
+ * Checks whether a given flag is set.
+ *
+ * @see sr_output_flag
+ * @since 0.4.0
+ */
+SR_API gboolean sr_output_test_flag(const struct sr_output_module *omod,
+ uint64_t flag)
+{
+ return (flag & omod->flags);
+}
+
/**
* Return the output module with the specified ID, or NULL if no module
* with that id is found.
* @since 0.4.0
*/
SR_API const struct sr_output *sr_output_new(const struct sr_output_module *omod,
- GHashTable *options, const struct sr_dev_inst *sdi)
+ GHashTable *options, const struct sr_dev_inst *sdi,
+ const char *filename)
{
struct sr_output *op;
const struct sr_option *mod_opts;
op = g_malloc(sizeof(struct sr_output));
op->module = omod;
op->sdi = sdi;
+ op->filename = g_strdup(filename);
new_opts = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
(GDestroyNotify)g_variant_unref);
/* 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);
+ sr_err("Invalid type for '%s' option.",
+ (char *)key);
g_free(op);
return NULL;
}
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'", omod->id, key);
+ sr_err("Output module '%s' has no option '%s'",
+ omod->id, (char *)key);
g_hash_table_destroy(new_opts);
g_free(op);
return NULL;
ret = SR_OK;
if (o->module->cleanup)
ret = o->module->cleanup((struct sr_output *)o);
+ g_free((char *)o->filename);
g_free((gpointer)o);
return ret;