X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=output%2Ftext%2Fhex.c;h=e976e9ba445b0ef639e50824df4a82949ea974f4;hp=e9102608ffb1bfe29bb09996e784ccb56bc42517;hb=ba7dd8bbb8168cba432a844259a3e239aa5f36d7;hpb=3544f848e0d7f67af8e11ce7ec344b34cd797df3 diff --git a/output/text/hex.c b/output/text/hex.c index e9102608..e976e9ba 100644 --- a/output/text/hex.c +++ b/output/text/hex.c @@ -45,7 +45,7 @@ SR_PRIV int data_hex(struct sr_output *o, const uint8_t *data_in, ctx = o->internal; max_linelen = SR_MAX_PROBENAME_LEN + 3 + ctx->samples_per_line + ctx->samples_per_line / 2; - outsize = length_in / ctx->unitsize * ctx->num_enabled_probes + outsize = length_in / ctx->unitsize * ctx->num_enabled_channels / ctx->samples_per_line * max_linelen + 512; if (!(outbuf = g_try_malloc0(outsize + 1))) { @@ -65,7 +65,7 @@ SR_PRIV int data_hex(struct sr_output *o, const uint8_t *data_in, for (offset = 0; offset <= length_in - ctx->unitsize; offset += ctx->unitsize) { sample = data_in + offset; - for (p = 0; p < ctx->num_enabled_probes; p++) { + for (p = 0; p < ctx->num_enabled_channels; p++) { ctx->linevalues[p] <<= 1; if (sample[p / 8] & ((uint8_t) 1 << (p % 8))) ctx->linevalues[p] |= 1; @@ -76,7 +76,7 @@ SR_PRIV int data_hex(struct sr_output *o, const uint8_t *data_in, /* Add a space after every complete hex byte. */ if ((ctx->spl_cnt & 7) == 0) { - for (p = 0; p < ctx->num_enabled_probes; p++) + for (p = 0; p < ctx->num_enabled_channels; p++) ctx->linebuf[p * ctx->linebuf_len + ctx->line_offset + 2] = ' '; ctx->line_offset += 3;