input/output modules: Adjust to GVariant-based sr_config_* functions

[libsigrok.git] / output / text / text.c

diff --git a/output/text/text.c b/output/text/text.c
index c48743218991f3c533b99e25237c23b8a96ae43b..31bf3989eb4e77d5d5ca05e1fafe67dbfa735965 100644 (file)
--- a/output/text/text.c
+++ b/output/text/text.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of the sigrok project.
  *
- * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
  * Copyright (C) 2011 Håvard Espeland <gus@ping.uio.no>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,11 +22,20 @@
 #include <stdio.h>
 #include <string.h>
 #include <glib.h>
-#include "config.h"
+#include "config.h" /* Needed for PACKAGE_STRING and others. */
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 #include "text.h"
 
+/* Message logging helpers with driver-specific prefix string. */
+#define DRIVER_LOG_DOMAIN "output/text: "
+#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
+#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+
 SR_PRIV void flush_linebufs(struct context *ctx, uint8_t *outbuf)
 {
        static int max_probename_len = 0;
@@ -70,19 +79,20 @@ SR_PRIV int init(struct sr_output *o, int default_spl, enum outputmode mode)
        struct context *ctx;
        struct sr_probe *probe;
        GSList *l;
+       GVariant *gvar;
        uint64_t samplerate;
-       int num_probes;
+       int num_probes, ret;
        char *samplerate_s;
 
        if (!(ctx = g_try_malloc0(sizeof(struct context)))) {
-               sr_err("text out: %s: ctx malloc failed", __func__);
+               sr_err("%s: ctx malloc failed", __func__);
                return SR_ERR_MALLOC;
        }
 
        o->internal = ctx;
        ctx->num_enabled_probes = 0;
 
-       for (l = o->dev->probes; l; l = l->next) {
+       for (l = o->sdi->probes; l; l = l->next) {
                probe = l->data;
                if (!probe->enabled)
                        continue;
@@ -96,51 +106,61 @@ SR_PRIV int init(struct sr_output *o, int default_spl, enum outputmode mode)
        ctx->mark_trigger = -1;
        ctx->mode = mode;
 
+       ret = SR_OK;
        if (o->param && o->param[0]) {
                ctx->samples_per_line = strtoul(o->param, NULL, 10);
-               if (ctx->samples_per_line < 1)
-                       return SR_ERR;
+               if (ctx->samples_per_line < 1) {
+                       ret = SR_ERR;
+                       goto err;
+               }
        } else
                ctx->samples_per_line = default_spl;
 
        if (!(ctx->header = g_try_malloc0(512))) {
-               g_free(ctx);
-               sr_err("text out: %s: ctx->header malloc failed", __func__);
-               return SR_ERR_MALLOC;
+               sr_err("%s: ctx->header malloc failed", __func__);
+               ret = SR_ERR_MALLOC;
+               goto err;
        }
 
        snprintf(ctx->header, 511, "%s\n", PACKAGE_STRING);
-       num_probes = g_slist_length(o->dev->probes);
-       if (o->dev->driver || sr_dev_has_hwcap(o->dev, SR_HWCAP_SAMPLERATE)) {
-               samplerate = *((uint64_t *) o->dev->driver->dev_info_get(
-                               o->dev->driver_index, SR_DI_CUR_SAMPLERATE));
+       num_probes = g_slist_length(o->sdi->probes);
+       if (o->sdi->driver || sr_dev_has_option(o->sdi, SR_CONF_SAMPLERATE)) {
+               if ((ret = o->sdi->driver->config_get(SR_CONF_SAMPLERATE, &gvar,
+                               o->sdi)) != SR_OK)
+                       goto err;
+               samplerate = g_variant_get_uint64(gvar);
                if (!(samplerate_s = sr_samplerate_string(samplerate))) {
-                       g_free(ctx->header);
-                       g_free(ctx);
-                       return SR_ERR;
+                       ret = SR_ERR;
+                       g_variant_unref(gvar);
+                       goto err;
                }
                snprintf(ctx->header + strlen(ctx->header),
                         511 - strlen(ctx->header),
                         "Acquisition with %d/%d probes at %s\n",
                         ctx->num_enabled_probes, num_probes, samplerate_s);
                g_free(samplerate_s);
+               g_variant_unref(gvar);
        }
 
        ctx->linebuf_len = ctx->samples_per_line * 2 + 4;
        if (!(ctx->linebuf = g_try_malloc0(num_probes * ctx->linebuf_len))) {
-               g_free(ctx->header);
-               g_free(ctx);
-               sr_err("text out: %s: ctx->linebuf malloc failed", __func__);
-               return SR_ERR_MALLOC;
+               sr_err("%s: ctx->linebuf malloc failed", __func__);
+               ret = SR_ERR_MALLOC;
+               goto err;
        }
+
        if (!(ctx->linevalues = g_try_malloc0(num_probes))) {
+               sr_err("%s: ctx->linevalues malloc failed", __func__);
+               ret = SR_ERR_MALLOC;
+       }
+
+err:
+       if (ret != SR_OK) {
                g_free(ctx->header);
                g_free(ctx);
-               sr_err("text out: %s: ctx->linevalues malloc failed", __func__);
-               return SR_ERR_MALLOC;
        }
 
-       return SR_OK;
+       return ret;
 }
 
 SR_PRIV int event(struct sr_output *o, int event_type, uint8_t **data_out,
@@ -161,7 +181,7 @@ SR_PRIV int event(struct sr_output *o, int event_type, uint8_t **data_out,
                outsize = ctx->num_enabled_probes
                                * (ctx->samples_per_line + 20) + 512;
                if (!(outbuf = g_try_malloc0(outsize))) {
-                       sr_err("text out: %s: outbuf malloc failed", __func__);
+                       sr_err("%s: outbuf malloc failed", __func__);
                        return SR_ERR_MALLOC;
                }
                flush_linebufs(ctx, outbuf);