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

diff --git a/output/chronovu_la8.c b/output/chronovu_la8.c
index 91ad56e6..688e1b54 100644
--- a/output/chronovu_la8.c
+++ b/output/chronovu_la8.c
@@ -21,8 +21,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 
 struct context {
 	unsigned int num_enabled_probes;
@@ -86,21 +86,20 @@ static int init(struct sr_output *o)
 	struct context *ctx;
 	struct sr_probe *probe;
 	GSList *l;
-	int num_probes;
-	uint64_t samplerate;
+	uint64_t *samplerate;
 
 	if (!o) {
 		sr_warn("la8 out: %s: o was NULL", __func__);
 		return SR_ERR_ARG;
 	}
 
-	if (!o->dev) {
-		sr_warn("la8 out: %s: o->dev was NULL", __func__);
+	if (!o->sdi) {
+		sr_warn("la8 out: %s: o->sdi was NULL", __func__);
 		return SR_ERR_ARG;
 	}
 
-	if (!o->dev->plugin) {
-		sr_warn("la8 out: %s: o->dev->plugin was NULL", __func__);
+	if (!o->sdi->driver) {
+		sr_warn("la8 out: %s: o->sdi->driver was NULL", __func__);
 		return SR_ERR_ARG;
 	}
 
@@ -111,9 +110,8 @@ 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->dev->probes; l; l = l->next) {
+	/* Get the probe names and the unitsize. */
+	for (l = o->sdi->probes; l; l = l->next) {
 		probe = l->data;
 		if (!probe->enabled)
 			continue;
@@ -122,25 +120,21 @@ 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));
-		/* 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;
 
-	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;
-	char *outbuf;
+	uint8_t *outbuf;
 
 	if (!o) {
 		sr_warn("la8 out: %s: o was NULL", __func__);
@@ -199,11 +193,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__);