X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Ftext%2Ftext.c;h=60d2715418ceb7451c500a68c45f4a3125a00698;hb=545f9786390a89b8bb6868907afa555fc0a6ece4;hp=10ce0767da46fdd9c22dcfc44a8212c56615daa6;hpb=133a37bfba1a7e1423716b2b872d3bb82a2e64d9;p=libsigrok.git diff --git a/output/text/text.c b/output/text/text.c index 10ce0767..60d27154 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,12 +22,12 @@ #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) +SR_PRIV void flush_linebufs(struct context *ctx, uint8_t *outbuf) { static int max_probename_len = 0; int len, i; @@ -45,7 +45,8 @@ SR_PRIV 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); } @@ -57,8 +58,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,8 +70,8 @@ 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 = g_try_malloc0(sizeof(struct context)))) { @@ -81,7 +82,7 @@ SR_PRIV int init(struct sr_output *o, int default_spl, enum outputmode mode) 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; @@ -95,28 +96,32 @@ 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; + 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))) { - g_free(ctx->header); - g_free(ctx); - return SR_ERR; + 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))) { + ret = SR_ERR; + goto err; } snprintf(ctx->header + strlen(ctx->header), 511 - strlen(ctx->header), @@ -127,27 +132,31 @@ 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; + ret = SR_ERR_MALLOC; + goto err; } + if (!(ctx->linevalues = g_try_malloc0(num_probes))) { + sr_err("text out: %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, 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) { @@ -165,7 +174,7 @@ SR_PRIV int event(struct sr_output *o, int event_type, char **data_out, } flush_linebufs(ctx, outbuf); *data_out = outbuf; - *length_out = strlen(outbuf); + *length_out = strlen((const char *)outbuf); g_free(o->internal); o->internal = NULL; break;