BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

output_text: Fix ASCII edge case.

This commit is contained in:
Håvard Espeland 2011-01-18 22:13:50 +01:00
parent d4f228d094
commit 6ef7a8cb5d
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
output/output_text.c
View File

@ -333,7 +333,7 @@ static int data_ascii(struct output *o, char *data_in, uint64_t length_in,
unsigned int outsize, offset, p; unsigned int outsize, offset, p;
int max_linelen; int max_linelen;
uint64_t sample; uint64_t sample;
char *outbuf, c; char *outbuf;
ctx = o->internal; ctx = o->internal;
max_linelen = MAX_PROBENAME_LEN + 3 + ctx->samples_per_line max_linelen = MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
@ -361,32 +361,27 @@ static int data_ascii(struct output *o, char *data_in, uint64_t length_in,
offset += ctx->unitsize) { offset += ctx->unitsize) {
memcpy(&sample, data_in + offset, ctx->unitsize); memcpy(&sample, data_in + offset, ctx->unitsize);
char tmpval[ctx->num_enabled_probes];
for (p = 0; p < ctx->num_enabled_probes; p++) { for (p = 0; p < ctx->num_enabled_probes; p++) {
uint64_t curbit = (sample & ((uint64_t) 1 << p)); uint64_t curbit = (sample & ((uint64_t) 1 << p));
uint64_t prevbit = (ctx->prevsample & uint64_t prevbit = (ctx->prevsample &
((uint64_t) 1 << p)); ((uint64_t) 1 << p));
if (curbit < prevbit) { if (curbit < prevbit && ctx->line_offset > 0) {
/* XXX: Does not draw \ at EOL. */
ctx->linebuf[p * ctx->linebuf_len + ctx->linebuf[p * ctx->linebuf_len +
ctx->line_offset-1] = '\\'; ctx->line_offset-1] = '\\';
} }
if (curbit > prevbit) if (curbit > prevbit) {
c = '/'; tmpval[p] = '/';
else } else {
{
if (curbit) if (curbit)
c = '"'; tmpval[p] = '"';
else else
c = '.'; tmpval[p] = '.';
} }
ctx->linebuf[p * ctx->linebuf_len +
ctx->line_offset] = c;
} }
ctx->line_offset++;
ctx->spl_cnt++;
/* End of line. */ /* End of line. */
if (ctx->spl_cnt >= ctx->samples_per_line) { if (ctx->spl_cnt >= ctx->samples_per_line) {
@ -395,6 +390,14 @@ static int data_ascii(struct output *o, char *data_in, uint64_t length_in,
ctx->mark_trigger = -1; ctx->mark_trigger = -1;
} }
for (p = 0; p < ctx->num_enabled_probes; p++) {
ctx->linebuf[p * ctx->linebuf_len +
ctx->line_offset] = tmpval[p];
}
ctx->line_offset++;
ctx->spl_cnt++;
ctx->prevsample = sample; ctx->prevsample = sample;
} }
} else { } else {