X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fcsv.c;h=def7c893280960fe4a8ea51a6e3a5ffd6db6413c;hb=f18297a5fd88f09a9e1a1330777f6db6dfe8999a;hp=d56a023d7e7d3b3cf478935c29cc4af123cfd6c7;hpb=0da5b6a9f5a119ab485ed3dba08aeb4a3ad2c8f4;p=libsigrok.git

diff --git a/output/csv.c b/output/csv.c
index d56a023d..def7c893 100644
--- a/output/csv.c
+++ b/output/csv.c
@@ -21,9 +21,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "sigrok.h"
-#include "sigrok-internal.h"
-#include "config.h"
+#include "config.h" /* Needed for PACKAGE_STRING and others. */
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 
 struct context {
 	unsigned int num_enabled_probes;
@@ -52,7 +52,7 @@ static int init(struct sr_output *o)
 	struct sr_probe *probe;
 	GSList *l;
 	int num_probes;
-	uint64_t samplerate;
+	uint64_t *samplerate;
 	time_t t;
 	unsigned int i;
 
@@ -61,13 +61,13 @@ static int init(struct sr_output *o)
 		return SR_ERR_ARG;
 	}
 
-	if (!o->device) {
-		sr_err("csv out: %s: o->device was NULL", __func__);
+	if (!o->sdi) {
+		sr_err("csv out: %s: o->sdi was NULL", __func__);
 		return SR_ERR_ARG;
 	}
 
-	if (!o->device->plugin) {
-		sr_err("csv out: %s: o->device->plugin was NULL", __func__);
+	if (!o->sdi->driver) {
+		sr_err("csv out: %s: o->sdi->driver was NULL", __func__);
 		return SR_ERR_ARG;
 	}
 
@@ -79,8 +79,7 @@ static int init(struct sr_output *o)
 	o->internal = ctx;
 
 	/* Get the number of probes, their names, and the unitsize. */
-	/* TODO: Error handling. */
-	for (l = o->device->probes; l; l = l->next) {
+	for (l = o->sdi->probes; l; l = l->next) {
 		probe = l->data;
 		if (!probe->enabled)
 			continue;
@@ -89,19 +88,16 @@ static int init(struct sr_output *o)
 	ctx->probelist[ctx->num_enabled_probes] = 0;
 	ctx->unitsize = (ctx->num_enabled_probes + 7) / 8;
 
-	num_probes = g_slist_length(o->device->probes);
+	num_probes = g_slist_length(o->sdi->probes);
 
-	if (sr_device_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) {
-		samplerate = *((uint64_t *) o->device->plugin->get_device_info(
-				o->device->plugin_index, SR_DI_CUR_SAMPLERATE));
-		/* TODO: Error checks. */
-	} else {
-		samplerate = 0; /* TODO: Error or set some value? */
-	}
-	ctx->samplerate = samplerate;
+	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;
+	} else
+		ctx->samplerate = 0;
 
 	ctx->separator = ',';
-
 	ctx->header = g_string_sized_new(512);
 
 	t = time(NULL);
@@ -119,10 +115,10 @@ static int init(struct sr_output *o)
 		g_string_append_printf(ctx->header, "%s, ", ctx->probelist[i]);
 	g_string_append_printf(ctx->header, "\n");
 
-	return 0; /* TODO: SR_OK? */
+	return SR_OK;
 }
 
-static int event(struct sr_output *o, int event_type, char **data_out,
+static int event(struct sr_output *o, int event_type, uint8_t **data_out,
 		 uint64_t *length_out)
 {
 	struct context *ctx;
@@ -168,8 +164,8 @@ static int event(struct sr_output *o, int event_type, char **data_out,
 	return SR_OK;
 }
 
-static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
-		char **data_out, uint64_t *length_out)
+static int data(struct sr_output *o, const uint8_t *data_in,
+		uint64_t length_in, uint8_t **data_out, uint64_t *length_out)
 {
 	struct context *ctx;
 	GString *outstr;
@@ -209,14 +205,14 @@ static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
 		g_string_append_printf(outstr, "\n");
 	}
 
-	*data_out = outstr->str;
+	*data_out = (uint8_t *)outstr->str;
 	*length_out = outstr->len;
 	g_string_free(outstr, FALSE);
 
 	return SR_OK;
 }
 
-struct sr_output_format output_csv = {
+SR_PRIV struct sr_output_format output_csv = {
 	.id = "csv",
 	.description = "Comma-separated values (CSV)",
 	.df_type = SR_DF_LOGIC,