X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Ftext%2Ftext.c;h=7263224d1874f65c8df2bac2b3e0066f49dc2571;hb=c4650aca12630038fa034e2c0a2915073bdceedf;hp=30e04696db3534816c663e02ee080b6e7a033e4d;hpb=50985c2019b2b5a6ce394589d89ee925b4f5e3a9;p=libsigrok.git

diff --git a/output/text/text.c b/output/text/text.c
index 30e04696..7263224d 100644
--- a/output/text/text.c
+++ b/output/text/text.c
@@ -27,36 +27,40 @@
 #include "libsigrok-internal.h"
 #include "text.h"
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "output/text: "
-#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
-#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+/* Message logging helpers with subsystem-specific prefix string. */
+#define LOG_PREFIX "output/text: "
+#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
+#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
+#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
+#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
+#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
+#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
 
 SR_PRIV void flush_linebufs(struct context *ctx, uint8_t *outbuf)
 {
 	static int max_probename_len = 0;
 	int len, i;
+	GSList *l;
+	char *probe_name;
 
 	if (ctx->linebuf[0] == 0)
 		return;
 
 	if (max_probename_len == 0) {
 		/* First time through... */
-		for (i = 0; ctx->probelist[i]; i++) {
-			len = strlen(ctx->probelist[i]);
+		for (l = ctx->probenames; l; l = l->next) {
+			probe_name = l->data;
+			len = strlen(probe_name);
 			if (len > max_probename_len)
 				max_probename_len = len;
 		}
 	}
 
-	for (i = 0; ctx->probelist[i]; i++) {
+	for (i = 0, l = ctx->probenames; l; l = l->next, i++) {
+		probe_name = l->data;
 		sprintf((char *)outbuf + strlen((const char *)outbuf),
 			"%*s:%s\n", max_probename_len,
-			ctx->probelist[i], ctx->linebuf + i * ctx->linebuf_len);
+			probe_name, ctx->linebuf + i * ctx->linebuf_len);
 	}
 
 	/* Mark trigger with a ^ character. */
@@ -91,15 +95,16 @@ SR_PRIV int init(struct sr_output *o, int default_spl, enum outputmode mode)
 
 	o->internal = ctx;
 	ctx->num_enabled_probes = 0;
+	ctx->probenames = NULL;
 
 	for (l = o->sdi->probes; l; l = l->next) {
 		probe = l->data;
 		if (!probe->enabled)
 			continue;
-		ctx->probelist[ctx->num_enabled_probes++] = probe->name;
+		ctx->probenames = g_slist_append(ctx->probenames, probe->name);
+		ctx->num_enabled_probes++;
 	}
 
-	ctx->probelist[ctx->num_enabled_probes] = 0;
 	ctx->unitsize = (ctx->num_enabled_probes + 7) / 8;
 	ctx->line_offset = 0;
 	ctx->spl_cnt = 0;
@@ -124,14 +129,12 @@ SR_PRIV int init(struct sr_output *o, int default_spl, enum outputmode mode)
 
 	snprintf(ctx->header, 511, "%s\n", PACKAGE_STRING);
 	num_probes = g_slist_length(o->sdi->probes);
-	if (o->sdi->driver || sr_dev_has_option(o->sdi, SR_CONF_SAMPLERATE)) {
-		if ((ret = o->sdi->driver->config_get(SR_CONF_SAMPLERATE, &gvar,
-				o->sdi)) != SR_OK)
-			goto err;
+	if (sr_config_get(o->sdi->driver, o->sdi, NULL, SR_CONF_SAMPLERATE,
+			&gvar) == SR_OK) {
 		samplerate = g_variant_get_uint64(gvar);
+		g_variant_unref(gvar);
 		if (!(samplerate_s = sr_samplerate_string(samplerate))) {
 			ret = SR_ERR;
-			g_variant_unref(gvar);
 			goto err;
 		}
 		snprintf(ctx->header + strlen(ctx->header),
@@ -139,7 +142,6 @@ SR_PRIV int init(struct sr_output *o, int default_spl, enum outputmode mode)
 			 "Acquisition with %d/%d probes at %s\n",
 			 ctx->num_enabled_probes, num_probes, samplerate_s);
 		g_free(samplerate_s);
-		g_variant_unref(gvar);
 	}
 
 	ctx->linebuf_len = ctx->samples_per_line * 2 + 4;
@@ -154,6 +156,12 @@ SR_PRIV int init(struct sr_output *o, int default_spl, enum outputmode mode)
 		ret = SR_ERR_MALLOC;
 	}
 
+	if (mode == MODE_ASCII &&
+			!(ctx->prevsample = g_try_malloc0(num_probes / 8))) {
+		sr_err("%s: ctx->prevsample malloc failed", __func__);
+		ret = SR_ERR_MALLOC;
+	}
+
 err:
 	if (ret != SR_OK) {
 		g_free(ctx->header);
@@ -163,6 +171,31 @@ err:
 	return ret;
 }
 
+SR_PRIV int text_cleanup(struct sr_output *o)
+{
+	struct context *ctx;
+
+	if (!o)
+		return SR_ERR_ARG;
+
+	ctx = o->internal;
+
+	g_free(ctx->header);
+	g_free(ctx->linebuf);
+	g_free(ctx->linevalues);
+
+	if (ctx->prevsample)
+		g_free(ctx->prevsample);
+
+	g_slist_free(ctx->probenames);
+
+	g_free(ctx);
+
+	o->internal = NULL;
+
+	return SR_OK;
+}
+
 SR_PRIV int event(struct sr_output *o, int event_type, uint8_t **data_out,
 		  uint64_t *length_out)
 {
@@ -187,8 +220,6 @@ SR_PRIV int event(struct sr_output *o, int event_type, uint8_t **data_out,
 		flush_linebufs(ctx, outbuf);
 		*data_out = outbuf;
 		*length_out = strlen((const char *)outbuf);
-		g_free(o->internal);
-		o->internal = NULL;
 		break;
 	default:
 		*data_out = NULL;