X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Ftext%2Ftext.c;h=6856612127c1528f8df3f88380ed7230974584c8;hb=3544f848e0d7f67af8e11ce7ec344b34cd797df3;hp=f08d7cbc02ceeeac7d0200d4fb8be6f44c8dfb40;hpb=c09f0b578c0e9c03590cb814f66004bb3f6815ff;p=libsigrok.git diff --git a/output/text/text.c b/output/text/text.c index f08d7cbc..68566121 100644 --- a/output/text/text.c +++ b/output/text/text.c @@ -1,7 +1,7 @@ /* - * This file is part of the sigrok project. + * This file is part of the libsigrok project. * - * Copyright (C) 2010-2012 Bert Vermeulen + * Copyright (C) 2013 Bert Vermeulen * Copyright (C) 2011 HÃ¥vard Espeland * * This program is free software: you can redistribute it and/or modify @@ -22,31 +22,38 @@ #include #include #include -#include "config.h" -#include "sigrok.h" -#include "sigrok-internal.h" +#include "config.h" /* Needed for PACKAGE_STRING and others. */ +#include "libsigrok.h" +#include "libsigrok-internal.h" #include "text.h" -SR_PRIV void flush_linebufs(struct context *ctx, char *outbuf) +#define LOG_PREFIX "output/text" + +SR_PRIV void flush_linebufs(struct context *ctx, uint8_t *outbuf) { static int max_probename_len = 0; int len, i; + GSList *l; + char *probe_name; if (ctx->linebuf[0] == 0) return; if (max_probename_len == 0) { /* First time through... */ - for (i = 0; ctx->probelist[i]; i++) { - len = strlen(ctx->probelist[i]); + for (l = ctx->probenames; l; l = l->next) { + probe_name = l->data; + len = strlen(probe_name); if (len > max_probename_len) max_probename_len = len; } } - for (i = 0; ctx->probelist[i]; i++) { - sprintf(outbuf + strlen(outbuf), "%*s:%s\n", max_probename_len, - ctx->probelist[i], ctx->linebuf + i * ctx->linebuf_len); + for (i = 0, l = ctx->probenames; l; l = l->next, i++) { + probe_name = l->data; + sprintf((char *)outbuf + strlen((const char *)outbuf), + "%*s:%s\n", max_probename_len, + probe_name, ctx->linebuf + i * ctx->linebuf_len); } /* Mark trigger with a ^ character. */ @@ -57,8 +64,8 @@ SR_PRIV void flush_linebufs(struct context *ctx, char *outbuf) if (ctx->mode == MODE_ASCII) space_offset = 0; - sprintf(outbuf + strlen(outbuf), "T:%*s^\n", - ctx->mark_trigger + space_offset, ""); + sprintf((char *)outbuf + strlen((const char *)outbuf), + "T:%*s^\n", ctx->mark_trigger + space_offset, ""); } memset(ctx->linebuf, 0, i * ctx->linebuf_len); @@ -69,54 +76,59 @@ 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; + ctx->probenames = NULL; - 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; - ctx->probelist[ctx->num_enabled_probes++] = probe->name; + ctx->probenames = g_slist_append(ctx->probenames, probe->name); + ctx->num_enabled_probes++; } - ctx->probelist[ctx->num_enabled_probes] = 0; ctx->unitsize = (ctx->num_enabled_probes + 7) / 8; ctx->line_offset = 0; ctx->spl_cnt = 0; 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 (sr_config_get(o->sdi->driver, o->sdi, NULL, SR_CONF_SAMPLERATE, + &gvar) == SR_OK) { + samplerate = g_variant_get_uint64(gvar); + g_variant_unref(gvar); if (!(samplerate_s = sr_samplerate_string(samplerate))) { - g_free(ctx->header); - g_free(ctx); - return SR_ERR; + ret = SR_ERR; + goto err; } snprintf(ctx->header + strlen(ctx->header), 511 - strlen(ctx->header), @@ -127,27 +139,62 @@ SR_PRIV int init(struct sr_output *o, int default_spl, enum outputmode mode) 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; + } + + if (mode == MODE_ASCII && + !(ctx->prevsample = g_try_malloc0(num_probes / 8))) { + sr_err("%s: ctx->prevsample 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 ret; +} + +SR_PRIV int text_cleanup(struct sr_output *o) +{ + struct context *ctx; + + if (!o) + return SR_ERR_ARG; + + ctx = o->internal; + + g_free(ctx->header); + g_free(ctx->linebuf); + g_free(ctx->linevalues); + + if (ctx->prevsample) + g_free(ctx->prevsample); + + g_slist_free(ctx->probenames); + + g_free(ctx); + + o->internal = NULL; + return SR_OK; } -SR_PRIV int event(struct sr_output *o, int event_type, char **data_out, +SR_PRIV int event(struct sr_output *o, int event_type, uint8_t **data_out, uint64_t *length_out) { struct context *ctx; int outsize; - char *outbuf; + uint8_t *outbuf; ctx = o->internal; switch (event_type) { @@ -160,14 +207,12 @@ SR_PRIV int event(struct sr_output *o, int event_type, char **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); *data_out = outbuf; - *length_out = strlen(outbuf); - g_free(o->internal); - o->internal = NULL; + *length_out = strlen((const char *)outbuf); break; default: *data_out = NULL;