X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Fchronovu_la8.c;h=1c0953f71745f98463648e4da7774db2fbd82d93;hb=8a174d23427735617d69c7502ed8dcade786bbf9;hp=ad0b5d32fc2c1ccaf294fabdf7035cd977cecefe;hpb=155b680da482cea2381becb73c51cfb838bff31e;p=libsigrok.git

diff --git a/src/output/chronovu_la8.c b/src/output/chronovu_la8.c
index ad0b5d32..1c0953f7 100644
--- a/src/output/chronovu_la8.c
+++ b/src/output/chronovu_la8.c
@@ -75,17 +75,19 @@ static uint8_t samplerate_to_divcount(uint64_t samplerate)
 	return (SR_MHZ(100) / samplerate) - 1;
 }
 
-static int init(struct sr_output *o)
+static int init(struct sr_output *o, GHashTable *options)
 {
 	struct context *ctx;
 	struct sr_channel *ch;
 	GSList *l;
 
+	(void)options;
+
 	if (!o || !o->sdi)
 		return SR_ERR_ARG;
 
 	ctx = g_malloc0(sizeof(struct context));
-	o->internal = ctx;
+	o->priv = ctx;
 
 	for (l = o->sdi->channels; l; l = l->next) {
 		ch = l->data;
@@ -101,7 +103,7 @@ static int init(struct sr_output *o)
 	return SR_OK;
 }
 
-static int receive(struct sr_output *o, const struct sr_datafeed_packet *packet,
+static int receive(const struct sr_output *o, const struct sr_datafeed_packet *packet,
 		GString **out)
 {
 	const struct sr_datafeed_logic *logic;
@@ -113,7 +115,7 @@ static int receive(struct sr_output *o, const struct sr_datafeed_packet *packet,
 	*out = NULL;
 	if (!o || !o->sdi)
 		return SR_ERR_ARG;
-	if (!(ctx = o->internal))
+	if (!(ctx = o->priv))
 		return SR_ERR_ARG;
 
 	switch (packet->type) {
@@ -170,20 +172,23 @@ static int cleanup(struct sr_output *o)
 	if (!o || !o->sdi)
 		return SR_ERR_ARG;
 
-	if (o->internal) {
-		ctx = o->internal;
+	if (o->priv) {
+		ctx = o->priv;
 		g_string_free(ctx->pretrig_buf, TRUE);
 		g_free(ctx->channel_index);
-		g_free(o->internal);
-		o->internal = NULL;
+		g_free(o->priv);
+		o->priv = NULL;
 	}
 
 	return SR_OK;
 }
 
-SR_PRIV struct sr_output_format output_chronovu_la8 = {
+SR_PRIV struct sr_output_module output_chronovu_la8 = {
 	.id = "chronovu-la8",
-	.description = "ChronoVu LA8",
+	.name = "ChronoVu LA8",
+	.desc = "ChronoVu LA8 native file format",
+	.exts = (const char*[]){"kdt", NULL},
+	.options = NULL,
 	.init = init,
 	.receive = receive,
 	.cleanup = cleanup,