X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Ftext%2Ftext.h;h=78ef4783549ac19f454e611d784587c5c36fca3e;hb=50985c2019b2b5a6ce394589d89ee925b4f5e3a9;hp=c166d853117d566a685800105f787677cb27ba9c;hpb=54ac5277c5e462f1778300b9bc3fdd4709ecb2dc;p=libsigrok.git

diff --git a/output/text/text.h b/output/text/text.h
index c166d853..78ef4783 100644
--- a/output/text/text.h
+++ b/output/text/text.h
@@ -1,7 +1,7 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
- * Copyright (C) 2011 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
  *
  * 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
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TEXT_H_
-#define TEXT_H_
+#ifndef LIBSIGROK_OUTPUT_TEXT_TEXT_H
+#define LIBSIGROK_OUTPUT_TEXT_TEXT_H
 
 #define DEFAULT_BPL_BITS 64
 #define DEFAULT_BPL_HEX  192
@@ -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,22 +46,24 @@ struct context {
 	enum outputmode mode;
 };
 
-void flush_linebufs(struct context *ctx, char *outbuf);
-int init(struct sr_output *o, int default_spl, enum outputmode mode);
-int event(struct sr_output *o, int event_type, char **data_out,
-		 uint64_t *length_out);
+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, 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 uint8_t *data_in,
+		      uint64_t length_in, uint8_t **data_out,
+		      uint64_t *length_out);
 
-int init_bits(struct sr_output *o);
-int data_bits(struct sr_output *o, const char *data_in, uint64_t length_in,
-		     char **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 uint8_t *data_in,
+		     uint64_t length_in, uint8_t **data_out,
+		     uint64_t *length_out);
 
-int init_hex(struct sr_output *o);
-int data_hex(struct sr_output *o, const char *data_in, uint64_t length_in,
-		     char **data_out, uint64_t *length_out);
-
-int init_ascii(struct sr_output *o);
-int data_ascii(struct sr_output *o, const char *data_in, uint64_t length_in,
-		     char **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 uint8_t *data_in,
+		       uint64_t length_in, uint8_t **data_out,
+		       uint64_t *length_out);
 
 #endif