X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Ftext%2Ftext.c;h=e7b5d2c8eb263e3768efad62042ba97fe875ad90;hb=1953564a96798bc298d1c94eb90c129adbde1c9e;hp=9cac6ed0c697cf048da670579cd8bbd32ae218af;hpb=cd315a80d87a24a19a7846497d74c5ca85d494a0;p=libsigrok.git diff --git a/output/text/text.c b/output/text/text.c index 9cac6ed0..e7b5d2c8 100644 --- a/output/text/text.c +++ b/output/text/text.c @@ -1,7 +1,7 @@ /* * This file is part of the sigrok project. * - * Copyright (C) 2011 Bert Vermeulen + * Copyright (C) 2010-2012 Bert Vermeulen * Copyright (C) 2011 HÃ¥vard Espeland * * This program is free software: you can redistribute it and/or modify @@ -22,11 +22,21 @@ #include #include #include -#include "sigrok.h" -#include "config.h" +#include "config.h" /* Needed for PACKAGE_STRING and others. */ +#include "libsigrok.h" +#include "libsigrok-internal.h" #include "text.h" -void flush_linebufs(struct context *ctx, char *outbuf) +/* 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; int len, i; @@ -44,7 +54,8 @@ void flush_linebufs(struct context *ctx, char *outbuf) } for (i = 0; ctx->probelist[i]; i++) { - sprintf(outbuf + strlen(outbuf), "%*s:%s\n", max_probename_len, + sprintf((char *)outbuf + strlen((const char *)outbuf), + "%*s:%s\n", max_probename_len, ctx->probelist[i], ctx->linebuf + i * ctx->linebuf_len); } @@ -56,29 +67,31 @@ 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); } -int init(struct sr_output *o, int default_spl, enum outputmode mode) +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; - int num_probes; + uint64_t *samplerate; + int num_probes, ret; char *samplerate_s; - if (!(ctx = calloc(1, sizeof(struct context)))) + if (!(ctx = g_try_malloc0(sizeof(struct context)))) { + sr_err("%s: ctx malloc failed", __func__); return SR_ERR_MALLOC; + } o->internal = ctx; ctx->num_enabled_probes = 0; - for (l = o->device->probes; l; l = l->next) { + for (l = o->sdi->probes; l; l = l->next) { probe = l->data; if (!probe->enabled) continue; @@ -92,56 +105,67 @@ 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 = malloc(512))) { - free(ctx); - return SR_ERR_MALLOC; + if (!(ctx->header = g_try_malloc0(512))) { + 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->device->probes); - if (o->device->plugin || sr_device_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) { - samplerate = *((uint64_t *) o->device->plugin->get_device_info( - o->device->plugin_index, SR_DI_CUR_SAMPLERATE)); - if (!(samplerate_s = sr_samplerate_string(samplerate))) { - free(ctx->header); - free(ctx); - return SR_ERR; + num_probes = g_slist_length(o->sdi->probes); + if (o->sdi->driver || sr_dev_has_hwcap(o->sdi, SR_CONF_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))) { + ret = SR_ERR; + 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); - free(samplerate_s); + g_free(samplerate_s); } ctx->linebuf_len = ctx->samples_per_line * 2 + 4; - if (!(ctx->linebuf = calloc(1, num_probes * ctx->linebuf_len))) { - free(ctx->header); - free(ctx); - return SR_ERR_MALLOC; + if (!(ctx->linebuf = g_try_malloc0(num_probes * ctx->linebuf_len))) { + sr_err("%s: ctx->linebuf malloc failed", __func__); + ret = SR_ERR_MALLOC; + goto err; } - if (!(ctx->linevalues = calloc(1, num_probes))) { - free(ctx->header); - free(ctx); - return SR_ERR_MALLOC; + + if (!(ctx->linevalues = g_try_malloc0(num_probes))) { + sr_err("%s: ctx->linevalues malloc failed", __func__); + ret = SR_ERR_MALLOC; } - return SR_OK; +err: + if (ret != SR_OK) { + g_free(ctx->header); + g_free(ctx); + } + + return ret; } -int event(struct sr_output *o, int event_type, char **data_out, - uint64_t *length_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) { @@ -153,12 +177,14 @@ int event(struct sr_output *o, int event_type, char **data_out, case SR_DF_END: outsize = ctx->num_enabled_probes * (ctx->samples_per_line + 20) + 512; - if (!(outbuf = calloc(1, outsize))) + if (!(outbuf = g_try_malloc0(outsize))) { + sr_err("%s: outbuf malloc failed", __func__); return SR_ERR_MALLOC; + } flush_linebufs(ctx, outbuf); *data_out = outbuf; - *length_out = strlen(outbuf); - free(o->internal); + *length_out = strlen((const char *)outbuf); + g_free(o->internal); o->internal = NULL; break; default: