X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Foutput_text.c;h=6e2d4f08f46b0d02e1fda80b936fed0d08811b16;hb=9996570987d362a324384ed041040e884628853e;hp=82487df01232b99c2873c59dc371aae92f16a352;hpb=5045c217e69d6bbb5ca52c75799a4d64c72bfafd;p=libsigrok.git diff --git a/output/output_text.c b/output/output_text.c index 82487df0..6e2d4f08 100644 --- a/output/output_text.c +++ b/output/output_text.c @@ -22,9 +22,10 @@ #include #include #include +#include "config.h" #define DEFAULT_BPL_BITS 64 -#define DEFAULT_BPL_HEX 256 +#define DEFAULT_BPL_HEX 192 struct context { unsigned int num_enabled_probes; @@ -62,7 +63,7 @@ static void flush_linebufs(struct context *ctx, char *outbuf) ctx->probelist[i], ctx->linebuf + i * ctx->linebuf_len); } - /* Mark trigger with ^ */ + /* Mark trigger with a ^ character. */ if (ctx->mark_trigger != -1) sprintf(outbuf + strlen(outbuf), "T:%*s^\n", ctx->mark_trigger + (ctx->mark_trigger / 8), ""); @@ -79,14 +80,17 @@ static int init(struct output *o, int default_spl) int num_probes; char *samplerate_s; - ctx = malloc(sizeof(struct context)); + if (!(ctx = calloc(1, sizeof(struct context)))) + return SIGROK_ERR_MALLOC; + o->internal = ctx; ctx->num_enabled_probes = 0; for (l = o->device->probes; l; l = l->next) { probe = l->data; - if (probe->enabled) - ctx->probelist[ctx->num_enabled_probes++] = probe->name; + if (!probe->enabled) + continue; + ctx->probelist[ctx->num_enabled_probes++] = probe->name; } ctx->probelist[ctx->num_enabled_probes] = 0; @@ -95,28 +99,48 @@ static int init(struct output *o, int default_spl) ctx->spl_cnt = 0; ctx->mark_trigger = -1; - if (o->param && o->param[0]) + if (o->param && o->param[0]) { ctx->samples_per_line = strtoul(o->param, NULL, 10); - else + if (ctx->samples_per_line < 1) + return SIGROK_ERR; + } else ctx->samples_per_line = default_spl; - ctx->header = malloc(512); - num_probes = g_slist_length(o->device->probes); - samplerate = *((uint64_t *) o->device->plugin->get_device_info( - o->device->plugin_index, DI_CUR_SAMPLERATE)); - snprintf(ctx->header, 512, "Acquisition with %d/%d probes at ", - ctx->num_enabled_probes, num_probes); + if (!(ctx->header = malloc(512))) { + free(ctx); + return SIGROK_ERR_MALLOC; + } - if ((samplerate_s = sigrok_samplerate_string(samplerate)) == NULL) - return -1; /* FIXME */ - snprintf(ctx->header + strlen(ctx->header), 512, "%s\n", samplerate_s); - free(samplerate_s); + 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; + } + 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); + } - ctx->linebuf_len = ctx->samples_per_line * 2; - ctx->linebuf = calloc(1, num_probes * ctx->linebuf_len); - ctx->linevalues = calloc(1, num_probes); + 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->linevalues = calloc(1, num_probes))) { + free(ctx->header); + free(ctx); + return SIGROK_ERR_MALLOC; + } - return 0; + return SIGROK_OK; } static int event(struct output *o, int event_type, char **data_out, @@ -130,17 +154,24 @@ static int event(struct output *o, int event_type, char **data_out, switch (event_type) { case DF_TRIGGER: ctx->mark_trigger = ctx->spl_cnt; + *data_out = NULL; + *length_out = 0; break; case DF_END: outsize = ctx->num_enabled_probes * (ctx->samples_per_line + 20) + 512; - outbuf = calloc(1, outsize); + if (!(outbuf = calloc(1, outsize))) + return SIGROK_ERR_MALLOC; flush_linebufs(ctx, outbuf); *data_out = outbuf; *length_out = strlen(outbuf); free(o->internal); o->internal = NULL; break; + default: + *data_out = NULL; + *length_out = 0; + break; } return SIGROK_OK; @@ -156,32 +187,35 @@ static int data_bits(struct output *o, char *data_in, uint64_t length_in, { struct context *ctx; unsigned int outsize, offset, p; + int max_linelen; uint64_t sample; - char *outbuf; + char *outbuf, c; ctx = o->internal; - outsize = length_in / ctx->unitsize * ctx->num_enabled_probes * - ctx->samples_per_line + 512; - outbuf = calloc(1, outsize + 1); + max_linelen = MAX_PROBENAME_LEN + 3 + ctx->samples_per_line + + ctx->samples_per_line / 8; + outsize = (1 + (length_in / ctx->unitsize) / ctx->samples_per_line) + * (ctx->num_enabled_probes * max_linelen); + + if (!(outbuf = calloc(1, outsize + 1))) + return SIGROK_ERR_MALLOC; + + outbuf[0] = '\0'; if (ctx->header) { /* The header is still here, this must be the first packet. */ strncpy(outbuf, ctx->header, outsize); free(ctx->header); ctx->header = NULL; - } else - outbuf[0] = 0; + } if (length_in >= ctx->unitsize) { for (offset = 0; offset <= length_in - ctx->unitsize; offset += ctx->unitsize) { memcpy(&sample, data_in + offset, ctx->unitsize); for (p = 0; p < ctx->num_enabled_probes; p++) { - if (sample & ((uint64_t) 1 << p)) - ctx->linebuf[p * ctx->linebuf_len + - ctx->line_offset] = '1'; - else - ctx->linebuf[p * ctx->linebuf_len + - ctx->line_offset] = '0'; + c = (sample & ((uint64_t) 1 << p)) ? '1' : '0'; + ctx->linebuf[p * ctx->linebuf_len + + ctx->line_offset] = c; } ctx->line_offset++; ctx->spl_cnt++; @@ -201,8 +235,9 @@ static int data_bits(struct output *o, char *data_in, uint64_t length_in, ctx->mark_trigger = -1; } } - } else + } else { g_message("short buffer (length_in=%" PRIu64 ")", length_in); + } *data_out = outbuf; *length_out = strlen(outbuf); @@ -212,7 +247,7 @@ static int data_bits(struct output *o, char *data_in, uint64_t length_in, static int init_hex(struct output *o) { - return init(o, DEFAULT_BPL_BITS); + return init(o, DEFAULT_BPL_HEX); } static int data_hex(struct output *o, char *data_in, uint64_t length_in, @@ -220,20 +255,26 @@ static int data_hex(struct output *o, char *data_in, uint64_t length_in, { struct context *ctx; unsigned int outsize, offset, p; + int max_linelen; uint64_t sample; char *outbuf; ctx = o->internal; - outsize = length_in / ctx->unitsize * ctx->num_enabled_probes * - ctx->samples_per_line + 512; - outbuf = calloc(1, outsize + 1); + max_linelen = MAX_PROBENAME_LEN + 3 + ctx->samples_per_line + + ctx->samples_per_line / 2; + outsize = length_in / ctx->unitsize * ctx->num_enabled_probes + / ctx->samples_per_line * max_linelen + 512; + + if (!(outbuf = calloc(1, outsize + 1))) + return SIGROK_ERR_MALLOC; + + outbuf[0] = '\0'; if (ctx->header) { /* The header is still here, this must be the first packet. */ strncpy(outbuf, ctx->header, outsize); free(ctx->header); ctx->header = NULL; - } else - outbuf[0] = 0; + } ctx->line_offset = 0; for (offset = 0; offset <= length_in - ctx->unitsize; @@ -271,7 +312,8 @@ static int data_hex(struct output *o, char *data_in, uint64_t length_in, struct output_format output_text_bits = { "bits", - "Text (bits)", + "Bits (takes argument, default 64)", + DF_LOGIC, init_bits, data_bits, event, @@ -279,7 +321,8 @@ struct output_format output_text_bits = { struct output_format output_text_hex = { "hex", - "Text (hexadecimal)", + "Hexadecimal (takes argument, default 192)", + DF_LOGIC, init_hex, data_hex, event,