X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Foutput_text.c;h=ce3fbd9317430e70ddb53b65fc0315051ef7a8cd;hb=d4f228d094d53c95bdf4dd42525a271db716928d;hp=79ec794ec0a3cf9df30cab74359c0dd549d6639f;hpb=757b8c628a5b64f8b6b166044b1b3ac1ccf797dc;p=libsigrok.git diff --git a/output/output_text.c b/output/output_text.c index 79ec794e..ce3fbd93 100644 --- a/output/output_text.c +++ b/output/output_text.c @@ -2,6 +2,7 @@ * This file is part of the sigrok project. * * Copyright (C) 2010 Bert Vermeulen + * Copyright (C) 2011 HÃ¥vard Espeland * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,7 +26,8 @@ #include "config.h" #define DEFAULT_BPL_BITS 64 -#define DEFAULT_BPL_HEX 256 +#define DEFAULT_BPL_HEX 192 +#define DEFAULT_BPL_ASCII 74 struct context { unsigned int num_enabled_probes; @@ -39,6 +41,7 @@ struct context { uint8_t *linevalues; char *header; int mark_trigger; + uint64_t prevsample; }; static void flush_linebufs(struct context *ctx, char *outbuf) @@ -112,8 +115,8 @@ static int init(struct output *o, int default_spl) } snprintf(ctx->header, 511, "%s\n", PACKAGE_STRING); + num_probes = g_slist_length(o->device->probes); if (o->device->plugin) { - num_probes = g_slist_length(o->device->probes); samplerate = *((uint64_t *) o->device->plugin->get_device_info( o->device->plugin_index, DI_CUR_SAMPLERATE)); if (!(samplerate_s = sigrok_samplerate_string(samplerate))) { @@ -154,6 +157,8 @@ 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 @@ -166,6 +171,10 @@ static int event(struct output *o, int event_type, char **data_out, free(o->internal); o->internal = NULL; break; + default: + *data_out = NULL; + *length_out = 0; + break; } return SIGROK_OK; @@ -188,8 +197,12 @@ static int data_bits(struct output *o, char *data_in, uint64_t length_in, ctx = o->internal; max_linelen = MAX_PROBENAME_LEN + 3 + ctx->samples_per_line + ctx->samples_per_line / 8; - outsize = length_in / ctx->unitsize * ctx->num_enabled_probes - / ctx->samples_per_line * max_linelen + 512; + /* + * Calculate space needed for probes. Set aside 512 bytes for + * extra output, e.g. trigger. + */ + outsize = 512 + (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; @@ -200,6 +213,10 @@ static int data_bits(struct output *o, char *data_in, uint64_t length_in, strncpy(outbuf, ctx->header, outsize); free(ctx->header); ctx->header = NULL; + + /* Ensure first transition. */ + memcpy(&ctx->prevsample, data_in, ctx->unitsize); + ctx->prevsample = ~ctx->prevsample; } if (length_in >= ctx->unitsize) { @@ -241,7 +258,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, @@ -304,9 +321,97 @@ static int data_hex(struct output *o, char *data_in, uint64_t length_in, return SIGROK_OK; } +static int init_ascii(struct output *o) +{ + return init(o, DEFAULT_BPL_ASCII); +} + +static int data_ascii(struct output *o, char *data_in, uint64_t length_in, + char **data_out, uint64_t *length_out) +{ + struct context *ctx; + unsigned int outsize, offset, p; + int max_linelen; + uint64_t sample; + char *outbuf, c; + + ctx = o->internal; + max_linelen = MAX_PROBENAME_LEN + 3 + ctx->samples_per_line + + ctx->samples_per_line / 8; + /* + * Calculate space needed for probes. Set aside 512 bytes for + * extra output, e.g. trigger. + */ + outsize = 512 + (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; + } + + 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++) { + uint64_t curbit = (sample & ((uint64_t) 1 << p)); + uint64_t prevbit = (ctx->prevsample & + ((uint64_t) 1 << p)); + + if (curbit < prevbit) { + /* XXX: Does not draw \ at EOL. */ + ctx->linebuf[p * ctx->linebuf_len + + ctx->line_offset-1] = '\\'; + } + + if (curbit > prevbit) + c = '/'; + else + { + if (curbit) + c = '"'; + else + c = '.'; + } + + ctx->linebuf[p * ctx->linebuf_len + + ctx->line_offset] = c; + } + ctx->line_offset++; + ctx->spl_cnt++; + + /* End of line. */ + if (ctx->spl_cnt >= ctx->samples_per_line) { + flush_linebufs(ctx, outbuf); + ctx->line_offset = ctx->spl_cnt = 0; + ctx->mark_trigger = -1; + } + + ctx->prevsample = sample; + } + } else { + g_message("short buffer (length_in=%" PRIu64 ")", length_in); + } + + *data_out = outbuf; + *length_out = strlen(outbuf); + + return SIGROK_OK; +} + + struct output_format output_text_bits = { "bits", - "Text (bits)", + "Bits (takes argument, default 64)", + DF_LOGIC, init_bits, data_bits, event, @@ -314,8 +419,18 @@ 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, }; + +struct output_format output_text_ascii = { + "ascii", + "ASCII (takes argument, default 74)", + DF_LOGIC, + init_ascii, + data_ascii, + event, +};