X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fcsv.c;h=0f9f731aeff03f932cbff63ab18b890c41ffbd59;hb=d1ddc7a9a8a7226fcb1f8b5a360c275684e77e9a;hp=819008ae16b688f303fbc5d320ffa84b6d37aebe;hpb=5097b0d0912165429aceddb5febbf68467b623f5;p=libsigrok.git

diff --git a/output/csv.c b/output/csv.c
index 819008ae..0f9f731a 100644
--- a/output/csv.c
+++ b/output/csv.c
@@ -66,8 +66,8 @@ static int init(struct sr_output *o)
 		return SR_ERR_ARG;
 	}
 
-	if (!o->dev->plugin) {
-		sr_err("csv out: %s: o->dev->plugin was NULL", __func__);
+	if (!o->dev->driver) {
+		sr_err("csv out: %s: o->dev->driver was NULL", __func__);
 		return SR_ERR_ARG;
 	}
 
@@ -92,8 +92,8 @@ static int init(struct sr_output *o)
 	num_probes = g_slist_length(o->dev->probes);
 
 	if (sr_dev_has_hwcap(o->dev, SR_HWCAP_SAMPLERATE)) {
-		samplerate = *((uint64_t *) o->dev->plugin->dev_info_get(
-				o->dev->plugin_index, SR_DI_CUR_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);