X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Ftext%2Fhex.c;h=285102ee461f7005289e7ee0bc3b7d39fc69227e;hb=8a7b47cdfae4a4a95e92958beab41a4985e8f8e3;hp=e63feb143e4f999467d8f6d85b69a87e86f86a94;hpb=5a2326a71b3a7d3bc6b367a7a3dfa6f137f5f0ec;p=libsigrok.git diff --git a/output/text/hex.c b/output/text/hex.c index e63feb14..285102ee 100644 --- a/output/text/hex.c +++ b/output/text/hex.c @@ -24,14 +24,13 @@ #include #include "text.h" - int init_hex(struct sr_output *o) { return init(o, DEFAULT_BPL_HEX, MODE_HEX); } -int data_hex(struct sr_output *o, char *data_in, uint64_t length_in, - char **data_out, uint64_t *length_out) +int data_hex(struct sr_output *o, const char *data_in, uint64_t length_in, + char **data_out, uint64_t *length_out) { struct context *ctx; unsigned int outsize, offset, p; @@ -40,7 +39,7 @@ int data_hex(struct sr_output *o, char *data_in, uint64_t length_in, char *outbuf; ctx = o->internal; - max_linelen = MAX_PROBENAME_LEN + 3 + ctx->samples_per_line + 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 / ctx->samples_per_line * max_linelen + 512; @@ -90,7 +89,6 @@ int data_hex(struct sr_output *o, char *data_in, uint64_t length_in, return SR_OK; } - struct sr_output_format output_text_hex = { "hex", "Hexadecimal (takes argument, default 192)", @@ -99,4 +97,3 @@ struct sr_output_format output_text_hex = { data_hex, event, }; -