X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=output%2Foutput_binary.c;h=e5c1e4adb27ff537ffdeaa6c1206421466a6d443;hb=2f5c8c9696f4a4a8ca7e3c7e6e7d2766a4927026;hp=53240eebf8a80da4e471c423f1f771b7a0b12b56;hpb=9601818842c469339038e85b3c110b66d1a31d4b;p=libsigrok.git

diff --git a/output/output_binary.c b/output/output_binary.c
index 53240eeb..e5c1e4ad 100644
--- a/output/output_binary.c
+++ b/output/output_binary.c
@@ -22,56 +22,49 @@
 #include <string.h>
 #include <glib.h>
 #include <sigrok.h>
+#include <sigrok-internal.h>
 #include "config.h"
 
-
-static int event(struct output *o, int event_type, char **data_out,
-		 uint64_t *length_out)
+static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
+		char **data_out, uint64_t *length_out)
 {
+	char *outbuf;
 
 	/* Prevent compiler warnings. */
 	o = o;
-	event_type = event_type;
-	data_out = data_out;
 
-	switch (event_type) {
-	case DF_TRIGGER:
-		break;
-	case DF_END:
-		*length_out = 0;
-		break;
+	if (!data_in) {
+		sr_warn("binary output: %s: data_in was NULL", __func__);
+		return SR_ERR;
 	}
 
-	return SIGROK_OK;
-}
-
-static int data(struct output *o, char *data_in, uint64_t length_in,
-		char **data_out, uint64_t *length_out)
-{
-	uint64_t outsize;
-	char *outbuf;
+	if (!length_out) {
+		sr_warn("binary output: %s: length_out was NULL", __func__);
+		return SR_ERR;
+	}
 
-	/* Prevent compiler warnings. */
-	o = o;
+	if (length_in == 0) {
+		sr_warn("binary output: %s: length_in was 0", __func__);
+		return SR_ERR;
+	}
 
-	outsize = length_in;
-	outbuf = calloc(1, outsize);
-	if (outbuf == NULL)
-		return SIGROK_ERR_MALLOC;
+	if (!(outbuf = calloc(1, length_in))) {
+		sr_warn("binary output: %s: outbuf calloc failed", __func__);
+		return SR_ERR_MALLOC;
+	}
 
-	/* TODO: Are disabled probes handled correctly? */
 	memcpy(outbuf, data_in, length_in);
-
 	*data_out = outbuf;
-	*length_out = outsize;
+	*length_out = length_in;
 
-	return SIGROK_OK;
+	return SR_OK;
 }
 
-struct output_format output_binary = {
-	"binary",
-	"Raw binary",
-	NULL,
-	data,
-	event,
+struct sr_output_format output_binary = {
+	.id = "binary",
+	.description = "Raw binary",
+	.df_type = SR_DF_LOGIC,
+	.init = NULL,
+	.data = data,
+	.event = NULL,
 };