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

ascii: fix for big-endian architectures.

This commit is contained in:
Martin Ling 2013-04-26 21:35:18 +01:00 committed by Bert Vermeulen
parent ddb292571d
commit 3a581560f1
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
output/text/ascii.c
View File

@ -46,7 +46,7 @@ SR_PRIV int data_ascii(struct sr_output *o, const uint8_t *data_in,
struct context *ctx; struct context *ctx;
unsigned int outsize, offset, p; unsigned int outsize, offset, p;
int max_linelen; int max_linelen;
uint64_t sample; const uint8_t *sample;
uint8_t *outbuf; uint8_t *outbuf;
ctx = o->internal; ctx = o->internal;
@ -75,14 +75,14 @@ SR_PRIV int data_ascii(struct sr_output *o, const uint8_t *data_in,
if (length_in >= ctx->unitsize) { if (length_in >= ctx->unitsize) {
for (offset = 0; offset <= length_in - ctx->unitsize; for (offset = 0; offset <= length_in - ctx->unitsize;
offset += ctx->unitsize) { offset += ctx->unitsize) {
memcpy(&sample, data_in + offset, ctx->unitsize); sample = data_in + offset;
char tmpval[ctx->num_enabled_probes]; 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)); uint8_t curbit = (sample[p / 8] & ((uint8_t) 1 << (p % 8)));
uint64_t prevbit = (ctx->prevsample & uint8_t prevbit = (ctx->prevsample[p / 8] &
((uint64_t) 1 << p)); ((uint8_t) 1 << (p % 8)));
if (curbit < prevbit && ctx->line_offset > 0) { if (curbit < prevbit && ctx->line_offset > 0) {
ctx->linebuf[p * ctx->linebuf_len + ctx->linebuf[p * ctx->linebuf_len +
@ -114,7 +114,7 @@ SR_PRIV int data_ascii(struct sr_output *o, const uint8_t *data_in,
ctx->line_offset++; ctx->line_offset++;
ctx->spl_cnt++; ctx->spl_cnt++;
ctx->prevsample = sample; memcpy(ctx->prevsample, sample, ctx->unitsize);
} }
} else { } else {
sr_info("Short buffer (length_in=%" PRIu64 ").", length_in); sr_info("Short buffer (length_in=%" PRIu64 ").", length_in);

6
output/text/text.c
View File

@ -154,6 +154,12 @@ SR_PRIV int init(struct sr_output *o, int default_spl, enum outputmode mode)
ret = SR_ERR_MALLOC; ret = SR_ERR_MALLOC;
} }
if (mode == MODE_ASCII &&
!(ctx->prevsample = g_try_malloc0(num_probes / 8))) {
sr_err("%s: ctx->prevsample malloc failed", __func__);
ret = SR_ERR_MALLOC;
}
err: err:
if (ret != SR_OK) { if (ret != SR_OK) {
g_free(ctx->header); g_free(ctx->header);

2
output/text/text.h
View File

@ -42,7 +42,7 @@ struct context {
uint8_t *linevalues; uint8_t *linevalues;
char *header; char *header;
int mark_trigger; int mark_trigger;
uint64_t prevsample; uint8_t *prevsample;
enum outputmode mode; enum outputmode mode;
}; };