X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=output%2Ftext%2Ftext.h;h=a7414db39c8eb36069f08569f826ce4e1d6152cd;hb=6f64ebb22306d1436becd9da4fb3761c99462810;hp=8dcb45d22a089673cfdad66719acdfaca85322a1;hpb=8ec95d22822ed5ebf4b6aeaff654608ad0225073;p=libsigrok.git

diff --git a/output/text/text.h b/output/text/text.h
index 8dcb45d2..a7414db3 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 <bert@biot.com>
  *
@@ -31,38 +31,40 @@ enum outputmode {
 };
 
 struct context {
-	unsigned int num_enabled_probes;
+	unsigned int num_enabled_channels;
 	int samples_per_line;
 	unsigned int unitsize;
 	int line_offset;
 	int linebuf_len;
-	char *probelist[SR_MAX_NUM_PROBES + 1];
-	char *linebuf;
+	GSList *channelnames;
+	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 text_cleanup(struct sr_output *o);
+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