X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fchronovu_la8.c;h=cca6a295e7539fd4a834bb7f2f3fb66d1fada386;hb=7e41e319d9a76da527eaa6e2708e4909ffd0d971;hp=91ad56e6ed315357abaae2496088b2abeef3deec;hpb=5097b0d0912165429aceddb5febbf68467b623f5;p=libsigrok.git

diff --git a/output/chronovu_la8.c b/output/chronovu_la8.c
index 91ad56e6..cca6a295 100644
--- a/output/chronovu_la8.c
+++ b/output/chronovu_la8.c
@@ -86,7 +86,6 @@ static int init(struct sr_output *o)
 	struct context *ctx;
 	struct sr_probe *probe;
 	GSList *l;
-	int num_probes;
 	uint64_t samplerate;
 
 	if (!o) {
@@ -99,8 +98,8 @@ static int init(struct sr_output *o)
 		return SR_ERR_ARG;
 	}
 
-	if (!o->dev->plugin) {
-		sr_warn("la8 out: %s: o->dev->plugin was NULL", __func__);
+	if (!o->dev->driver) {
+		sr_warn("la8 out: %s: o->dev->driver was NULL", __func__);
 		return SR_ERR_ARG;
 	}
 
@@ -111,7 +110,7 @@ static int init(struct sr_output *o)
 
 	o->internal = ctx;
 
-	/* Get the number of probes, their names, and the unitsize. */
+	/* Get the probe names and the unitsize. */
 	/* TODO: Error handling. */
 	for (l = o->dev->probes; l; l = l->next) {
 		probe = l->data;
@@ -122,11 +121,9 @@ 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->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? */
@@ -136,11 +133,11 @@ 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;
-	char *outbuf;
+	uint8_t *outbuf;
 
 	if (!o) {
 		sr_warn("la8 out: %s: o was NULL", __func__);
@@ -199,11 +196,11 @@ 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;
-	char *outbuf;
+	uint8_t *outbuf;
 
 	if (!o) {
 		sr_warn("la8 out: %s: o was NULL", __func__);