X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fcsv.c;h=6de9ac3f155bfb7a7278631e5ce568a80efc751d;hb=036d378a628213f71afd24e9de475eacd592ca32;hp=31e4d8d9c78eef6d874b3d41ccf3115fd1973fbc;hpb=5c3c1241d2e2b5d456865e876490492d76174257;p=libsigrok.git

diff --git a/output/csv.c b/output/csv.c
index 31e4d8d9..6de9ac3f 100644
--- a/output/csv.c
+++ b/output/csv.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2011 Uwe Hermann <uwe@hermann-uwe.de>
  *
@@ -21,14 +21,15 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "config.h"
+#include "config.h" /* Needed for PACKAGE_STRING and others. */
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
+#define LOG_PREFIX "output/csv"
+
 struct context {
 	unsigned int num_enabled_probes;
 	unsigned int unitsize;
-	char *probelist[SR_MAX_NUM_PROBES + 1];
 	uint64_t samplerate;
 	GString *header;
 	char separator;
@@ -51,49 +52,45 @@ static int init(struct sr_output *o)
 	struct context *ctx;
 	struct sr_probe *probe;
 	GSList *l;
+	GVariant *gvar;
 	int num_probes;
-	uint64_t *samplerate;
 	time_t t;
-	unsigned int i;
 
 	if (!o) {
-		sr_err("csv out: %s: o was NULL", __func__);
+		sr_err("%s: o was NULL", __func__);
 		return SR_ERR_ARG;
 	}
 
 	if (!o->sdi) {
-		sr_err("csv out: %s: o->sdi was NULL", __func__);
-		return SR_ERR_ARG;
-	}
-
-	if (!o->sdi->driver) {
-		sr_err("csv out: %s: o->sdi->driver was NULL", __func__);
+		sr_err("%s: o->sdi was NULL", __func__);
 		return SR_ERR_ARG;
 	}
 
 	if (!(ctx = g_try_malloc0(sizeof(struct context)))) {
-		sr_err("csv out: %s: ctx malloc failed", __func__);
+		sr_err("%s: ctx malloc failed", __func__);
 		return SR_ERR_MALLOC;
 	}
 
 	o->internal = ctx;
 
-	/* Get the number of probes, their names, and the unitsize. */
+	/* Get the number of probes, and the unitsize. */
 	for (l = o->sdi->probes; l; l = l->next) {
 		probe = l->data;
+		if (probe->type != SR_PROBE_LOGIC)
+			continue;
 		if (!probe->enabled)
 			continue;
-		ctx->probelist[ctx->num_enabled_probes++] = probe->name;
+		ctx->num_enabled_probes++;
 	}
-	ctx->probelist[ctx->num_enabled_probes] = 0;
+
 	ctx->unitsize = (ctx->num_enabled_probes + 7) / 8;
 
 	num_probes = g_slist_length(o->sdi->probes);
 
-	if (sr_dev_has_hwcap(o->sdi, SR_HWCAP_SAMPLERATE)) {
-		o->sdi->driver->info_get(SR_DI_CUR_SAMPLERATE,
-				(const void **)&samplerate, o->sdi);
-		ctx->samplerate = *samplerate;
+	if (sr_config_get(o->sdi->driver, o->sdi, NULL, SR_CONF_SAMPLERATE,
+			&gvar) == SR_OK) {
+		ctx->samplerate = g_variant_get_uint64(gvar);
+		g_variant_unref(gvar);
 	} else
 		ctx->samplerate = 0;
 
@@ -111,8 +108,14 @@ static int init(struct sr_output *o)
 	/* Columns / channels */
 	g_string_append_printf(ctx->header, "; Channels (%d/%d): ",
 			       ctx->num_enabled_probes, num_probes);
-	for (i = 0; i < ctx->num_enabled_probes; i++)
-		g_string_append_printf(ctx->header, "%s, ", ctx->probelist[i]);
+	for (l = o->sdi->probes; l; l = l->next) {
+		probe = l->data;
+		if (probe->type != SR_PROBE_LOGIC)
+			continue;
+		if (!probe->enabled)
+			continue;
+		g_string_append_printf(ctx->header, "%s, ", probe->name);
+	}
 	g_string_append_printf(ctx->header, "\n");
 
 	return SR_OK;
@@ -124,29 +127,29 @@ static int event(struct sr_output *o, int event_type, uint8_t **data_out,
 	struct context *ctx;
 
 	if (!o) {
-		sr_err("csv out: %s: o was NULL", __func__);
+		sr_err("%s: o was NULL", __func__);
 		return SR_ERR_ARG;
 	}
 
 	if (!(ctx = o->internal)) {
-		sr_err("csv out: %s: o->internal was NULL", __func__);
+		sr_err("%s: o->internal was NULL", __func__);
 		return SR_ERR_ARG;
 	}
 
 	if (!data_out) {
-		sr_err("csv out: %s: data_out was NULL", __func__);
+		sr_err("%s: data_out was NULL", __func__);
 		return SR_ERR_ARG;
 	}
 
 	switch (event_type) {
 	case SR_DF_TRIGGER:
-		sr_dbg("csv out: %s: SR_DF_TRIGGER event", __func__);
+		sr_dbg("%s: SR_DF_TRIGGER event", __func__);
 		/* TODO */
 		*data_out = NULL;
 		*length_out = 0;
 		break;
 	case SR_DF_END:
-		sr_dbg("csv out: %s: SR_DF_END event", __func__);
+		sr_dbg("%s: SR_DF_END event", __func__);
 		/* TODO */
 		*data_out = NULL;
 		*length_out = 0;
@@ -154,8 +157,7 @@ static int event(struct sr_output *o, int event_type, uint8_t **data_out,
 		o->internal = NULL;
 		break;
 	default:
-		sr_err("csv out: %s: unsupported event type: %d", __func__,
-		       event_type);
+		sr_err("%s: unsupported event type: %d", __func__, event_type);
 		*data_out = NULL;
 		*length_out = 0;
 		break;
@@ -169,21 +171,20 @@ static int data(struct sr_output *o, const uint8_t *data_in,
 {
 	struct context *ctx;
 	GString *outstr;
-	uint64_t sample, i;
-	int j;
+	uint64_t sample, i, j;
 
 	if (!o) {
-		sr_err("csv out: %s: o was NULL", __func__);
+		sr_err("%s: o was NULL", __func__);
 		return SR_ERR_ARG;
 	}
 
 	if (!(ctx = o->internal)) {
-		sr_err("csv out: %s: o->internal was NULL", __func__);
+		sr_err("%s: o->internal was NULL", __func__);
 		return SR_ERR_ARG;
 	}
 
 	if (!data_in) {
-		sr_err("csv out: %s: data_in was NULL", __func__);
+		sr_err("%s: data_in was NULL", __func__);
 		return SR_ERR_ARG;
 	}
 
@@ -197,7 +198,7 @@ static int data(struct sr_output *o, const uint8_t *data_in,
 
 	for (i = 0; i <= length_in - ctx->unitsize; i += ctx->unitsize) {
 		memcpy(&sample, data_in + i, ctx->unitsize);
-		for (j = ctx->num_enabled_probes - 1; j >= 0; j--) {
+		for (j = 0; j < ctx->num_enabled_probes; j++) {
 			g_string_append_printf(outstr, "%d%c",
 				(int)((sample & (1 << j)) >> j),
 				ctx->separator);