X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Ftext%2Ftext.c;h=f08d7cbc02ceeeac7d0200d4fb8be6f44c8dfb40;hb=31ccebc4925d245fed02545415ce3ee14055d897;hp=84e41e45b7ce7fc757dcd78308959b51faa30979;hpb=97554432e8d8bcf7f5af2dd770bcf752c9cd7d75;p=libsigrok.git diff --git a/output/text/text.c b/output/text/text.c index 84e41e45..f08d7cbc 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 #include "config.h" +#include "sigrok.h" +#include "sigrok-internal.h" #include "text.h" - -void flush_linebufs(struct context *ctx, char *outbuf) +SR_PRIV void flush_linebufs(struct context *ctx, char *outbuf) { static int max_probename_len = 0; int len, i; @@ -64,22 +64,24 @@ void flush_linebufs(struct context *ctx, char *outbuf) memset(ctx->linebuf, 0, i * ctx->linebuf_len); } -int init(struct 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 probe *probe; + struct sr_probe *probe; GSList *l; uint64_t samplerate; int num_probes; char *samplerate_s; - if (!(ctx = calloc(1, sizeof(struct context)))) - return SIGROK_ERR_MALLOC; + if (!(ctx = g_try_malloc0(sizeof(struct context)))) { + sr_err("text out: %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->dev->probes; l; l = l->next) { probe = l->data; if (!probe->enabled) continue; @@ -96,49 +98,52 @@ int init(struct output *o, int default_spl, enum outputmode mode) if (o->param && o->param[0]) { ctx->samples_per_line = strtoul(o->param, NULL, 10); if (ctx->samples_per_line < 1) - return SIGROK_ERR; + return SR_ERR; } else ctx->samples_per_line = default_spl; - if (!(ctx->header = malloc(512))) { - free(ctx); - return SIGROK_ERR_MALLOC; + if (!(ctx->header = g_try_malloc0(512))) { + g_free(ctx); + sr_err("text out: %s: ctx->header malloc failed", __func__); + return SR_ERR_MALLOC; } snprintf(ctx->header, 511, "%s\n", PACKAGE_STRING); - num_probes = g_slist_length(o->device->probes); - if (o->device->plugin) { - samplerate = *((uint64_t *) o->device->plugin->get_device_info( - o->device->plugin_index, DI_CUR_SAMPLERATE)); - if (!(samplerate_s = sigrok_samplerate_string(samplerate))) { - free(ctx->header); - free(ctx); - return SIGROK_ERR; + 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)); + if (!(samplerate_s = sr_samplerate_string(samplerate))) { + g_free(ctx->header); + g_free(ctx); + return SR_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 SIGROK_ERR_MALLOC; + 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; } - if (!(ctx->linevalues = calloc(1, num_probes))) { - free(ctx->header); - free(ctx); - return SIGROK_ERR_MALLOC; + if (!(ctx->linevalues = g_try_malloc0(num_probes))) { + g_free(ctx->header); + g_free(ctx); + sr_err("text out: %s: ctx->linevalues malloc failed", __func__); + return SR_ERR_MALLOC; } - return SIGROK_OK; + return SR_OK; } -int event(struct output *o, int event_type, char **data_out, - uint64_t *length_out) +SR_PRIV int event(struct sr_output *o, int event_type, char **data_out, + uint64_t *length_out) { struct context *ctx; int outsize; @@ -146,20 +151,22 @@ int event(struct output *o, int event_type, char **data_out, ctx = o->internal; switch (event_type) { - case DF_TRIGGER: + case SR_DF_TRIGGER: ctx->mark_trigger = ctx->spl_cnt; *data_out = NULL; *length_out = 0; break; - case DF_END: + case SR_DF_END: outsize = ctx->num_enabled_probes * (ctx->samples_per_line + 20) + 512; - if (!(outbuf = calloc(1, outsize))) - return SIGROK_ERR_MALLOC; + if (!(outbuf = g_try_malloc0(outsize))) { + sr_err("text out: %s: outbuf malloc failed", __func__); + return SR_ERR_MALLOC; + } flush_linebufs(ctx, outbuf); *data_out = outbuf; *length_out = strlen(outbuf); - free(o->internal); + g_free(o->internal); o->internal = NULL; break; default: @@ -168,6 +175,5 @@ int event(struct output *o, int event_type, char **data_out, break; } - return SIGROK_OK; + return SR_OK; } -