X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Ftext%2Ftext.h;h=3469e62ec1a09fc37651f7b93411fe6f24ba7f65;hb=40830061eb3a1327c1a8c76758e84b252e1950a8;hp=d23d22ef3be4132de0104af16a30c6ddd8a364ed;hpb=7c1d391c8b33bf76f7c6617fe9d5174e16a04f95;p=libsigrok.git diff --git a/output/text/text.h b/output/text/text.h index d23d22ef..3469e62e 100644 --- a/output/text/text.h +++ b/output/text/text.h @@ -1,7 +1,7 @@ /* * This file is part of the sigrok project. * - * Copyright (C) 2011 Bert Vermeulen + * Copyright (C) 2010-2012 Bert Vermeulen * * 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 @@ -36,8 +36,8 @@ struct context { unsigned int unitsize; int line_offset; int linebuf_len; - char *probelist[65]; - char *linebuf; + char *probelist[SR_MAX_NUM_PROBES + 1]; + uint8_t *linebuf; int spl_cnt; uint8_t *linevalues; char *header; @@ -46,23 +46,24 @@ struct context { enum outputmode mode; }; -SR_PRIV void flush_linebufs(struct context *ctx, char *outbuf); +SR_PRIV void flush_linebufs(struct context *ctx, uint8_t *outbuf); SR_PRIV int init(struct sr_output *o, int default_spl, enum outputmode mode); -SR_PRIV int event(struct sr_output *o, int event_type, char **data_out, +SR_PRIV int event(struct sr_output *o, int event_type, uint8_t **data_out, uint64_t *length_out); SR_PRIV int init_bits(struct sr_output *o); -SR_PRIV int data_bits(struct sr_output *o, const char *data_in, - uint64_t length_in, char **data_out, +SR_PRIV int data_bits(struct sr_output *o, const uint8_t *data_in, + uint64_t length_in, uint8_t **data_out, uint64_t *length_out); SR_PRIV int init_hex(struct sr_output *o); -SR_PRIV int data_hex(struct sr_output *o, const char *data_in, - uint64_t length_in, char **data_out, uint64_t *length_out); +SR_PRIV int data_hex(struct sr_output *o, const uint8_t *data_in, + uint64_t length_in, uint8_t **data_out, + uint64_t *length_out); SR_PRIV int init_ascii(struct sr_output *o); -SR_PRIV int data_ascii(struct sr_output *o, const char *data_in, - uint64_t length_in, char **data_out, +SR_PRIV int data_ascii(struct sr_output *o, const uint8_t *data_in, + uint64_t length_in, uint8_t **data_out, uint64_t *length_out); #endif