X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Ftext%2Ftext.h;h=f3ada90dc23ae3af3ae7b91865aa7740e683c087;hb=db9679afc9f46bdf038efabd3ac69983d15f89cf;hp=4ec26985a21ea280cfee7154fbde6f5946eb0842;hpb=c73d2ea421c2b425c3f0ae33bce2bfd0c448ca5f;p=libsigrok.git diff --git a/output/text/text.h b/output/text/text.h index 4ec26985..f3ada90d 100644 --- a/output/text/text.h +++ b/output/text/text.h @@ -1,5 +1,5 @@ /* - * This file is part of the sigrok project. + * This file is part of the libsigrok project. * * Copyright (C) 2010-2012 Bert Vermeulen * @@ -36,33 +36,34 @@ 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; int mark_trigger; - uint64_t prevsample; + uint8_t *prevsample; 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