X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fcsv.c;h=0f9f731aeff03f932cbff63ab18b890c41ffbd59;hb=6e71ef3b6f27c3f3e1c5d5dc4e2f60caf54fc818;hp=c1b0ee9247db00e0aac88f199e5a97570147a09b;hpb=031685005b022b98b5b1604cc6226c0cc2b959f8;p=libsigrok.git

diff --git a/output/csv.c b/output/csv.c
index c1b0ee92..0f9f731a 100644
--- a/output/csv.c
+++ b/output/csv.c
@@ -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->dev) {
+		sr_err("csv out: %s: o->dev was NULL", __func__);
 		return SR_ERR_ARG;
 	}
 
-	if (!o->device->plugin) {
-		sr_err("csv out: %s: o->device->plugin was NULL", __func__);
+	if (!o->dev->driver) {
+		sr_err("csv out: %s: o->dev->driver was NULL", __func__);
 		return SR_ERR_ARG;
 	}
 
@@ -80,7 +80,7 @@ static int init(struct sr_output *o)
 
 	/* 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->dev->probes; l; l = l->next) {
 		probe = l->data;
 		if (!probe->enabled)
 			continue;
@@ -89,11 +89,11 @@ 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->dev->probes);
 
-	if (sr_dev_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) {
-		samplerate = *((uint64_t *) o->device->plugin->get_device_info(
-				o->device->plugin_index, SR_DI_CUR_SAMPLERATE));
+	if (sr_dev_has_hwcap(o->dev, SR_HWCAP_SAMPLERATE)) {
+		samplerate = *((uint64_t *) o->dev->driver->dev_info_get(
+				o->dev->driver_index, SR_DI_CUR_SAMPLERATE));
 		/* TODO: Error checks. */
 	} else {
 		samplerate = 0; /* TODO: Error or set some value? */
@@ -122,7 +122,7 @@ static int init(struct sr_output *o)
 	return 0; /* TODO: 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 +168,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,7 +209,7 @@ 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);