X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Fanalog.c;h=c76392caeffbf488ad373e84d1eb92bd0385f41e;hb=a24c3f4a899d61a6bfc837a1969dbacf42e2ea72;hp=fbc41d88ffa9e52e1f010fcd705aeca52b203f16;hpb=155b680da482cea2381becb73c51cfb838bff31e;p=libsigrok.git

diff --git a/src/output/analog.c b/src/output/analog.c
index fbc41d88..c76392ca 100644
--- a/src/output/analog.c
+++ b/src/output/analog.c
@@ -31,13 +31,13 @@ struct context {
 	GPtrArray *channellist;
 };
 
-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;
 
-	sr_spew("Initializing output module.");
+	(void)options;
 
 	if (!o || !o->sdi)
 		return SR_ERR_ARG;
@@ -46,7 +46,7 @@ static int init(struct sr_output *o)
 		sr_err("Output module context malloc failed.");
 		return SR_ERR_MALLOC;
 	}
-	o->internal = ctx;
+	o->priv = ctx;
 
 	/* Get the number of channels and their names. */
 	ctx->channellist = g_ptr_array_new();
@@ -215,14 +215,14 @@ static void fancyprint(int unit, int mqflags, float value, GString *out)
 	g_string_append_c(out, '\n');
 }
 
-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_analog *analog;
 	struct sr_channel *ch;
 	GSList *l;
 	const float *fdata;
-	int i, p;
+	int num_channels, i, c;
 
 	*out = NULL;
 	if (!o || !o->sdi)
@@ -239,12 +239,13 @@ static int receive(struct sr_output *o, const struct sr_datafeed_packet *packet,
 		analog = packet->payload;
 		fdata = (const float *)analog->data;
 		*out = g_string_sized_new(512);
+		num_channels = g_slist_length(analog->channels);
 		for (i = 0; i < analog->num_samples; i++) {
-			for (l = analog->channels, p = 0; l; l = l->next, p++) {
+			for (l = analog->channels, c = 0; l; l = l->next, c++) {
 				ch = l->data;
 				g_string_append_printf(*out, "%s: ", ch->name);
 				fancyprint(analog->unit, analog->mqflags,
-						fdata[i + p], *out);
+						fdata[i * num_channels + c], *out);
 			}
 		}
 		break;
@@ -259,18 +260,20 @@ static int cleanup(struct sr_output *o)
 
 	if (!o || !o->sdi)
 		return SR_ERR_ARG;
-	ctx = o->internal;
+	ctx = o->priv;
 
 	g_ptr_array_free(ctx->channellist, 1);
 	g_free(ctx);
-	o->internal = NULL;
+	o->priv = NULL;
 
 	return SR_OK;
 }
 
-SR_PRIV struct sr_output_format output_analog = {
+SR_PRIV struct sr_output_module output_analog = {
 	.id = "analog",
-	.description = "Analog data",
+	.name = "Analog",
+	.desc = "Analog data and types",
+	.options = NULL,
 	.init = init,
 	.receive = receive,
 	.cleanup = cleanup