X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Ftext%2Ftext.c;h=7263224d1874f65c8df2bac2b3e0066f49dc2571;hb=dafafb0e9429fcc9185df1c861184ce79defb7ee;hp=6462cb9edb34d739f0523e71fb9d50d08cc4f958;hpb=aee878fa2efb8483bf93fa3bb03508357fc713a8;p=libsigrok.git diff --git a/output/text/text.c b/output/text/text.c index 6462cb9e..7263224d 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,32 +22,45 @@ #include #include #include -#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 subsystem-specific prefix string. */ +#define LOG_PREFIX "output/text: " +#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args) +#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args) +#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args) +#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args) +#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args) +#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args) + 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++) { + 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, - ctx->probelist[i], ctx->linebuf + i * ctx->linebuf_len); + probe_name, ctx->linebuf + i * ctx->linebuf_len); } /* Mark trigger with a ^ character. */ @@ -70,26 +83,28 @@ SR_PRIV int init(struct sr_output *o, int default_spl, enum outputmode mode) struct context *ctx; struct sr_probe *probe; GSList *l; - uint64_t *samplerate; + GVariant *gvar; + uint64_t samplerate; 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->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; @@ -107,19 +122,18 @@ SR_PRIV int init(struct sr_output *o, int default_spl, enum outputmode mode) ctx->samples_per_line = default_spl; if (!(ctx->header = g_try_malloc0(512))) { - sr_err("text out: %s: ctx->header malloc failed", __func__); + 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->sdi->probes); - if (o->sdi->driver || sr_dev_has_hwcap(o->sdi, SR_HWCAP_SAMPLERATE)) { - ret = o->sdi->driver->info_get(SR_DI_CUR_SAMPLERATE, - (const void **)&samplerate, o->sdi); - if (ret != SR_OK) - goto err; - if (!(samplerate_s = sr_samplerate_string(*samplerate))) { + 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))) { ret = SR_ERR; goto err; } @@ -132,13 +146,19 @@ 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))) { - sr_err("text out: %s: ctx->linebuf malloc failed", __func__); + sr_err("%s: ctx->linebuf malloc failed", __func__); ret = SR_ERR_MALLOC; goto err; } if (!(ctx->linevalues = g_try_malloc0(num_probes))) { - sr_err("text out: %s: ctx->linevalues malloc failed", __func__); + 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; } @@ -151,6 +171,31 @@ err: 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, uint8_t **data_out, uint64_t *length_out) { @@ -169,14 +214,12 @@ 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); *data_out = outbuf; *length_out = strlen((const char *)outbuf); - g_free(o->internal); - o->internal = NULL; break; default: *data_out = NULL;