X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Foutput_binary.c;h=f542958554c50aa7bdaaf7fe5b26153c95d2f93e;hb=cdb3573ceba61b02b80f7fc979d166db5b6ff3bc;hp=38338e374743fecde178e8d449d53b4f1f5d4abc;hpb=1c5b9d302c410cdd1cba441f618e0e3f7afa137d;p=libsigrok.git

diff --git a/output/output_binary.c b/output/output_binary.c
index 38338e37..f5429585 100644
--- a/output/output_binary.c
+++ b/output/output_binary.c
@@ -24,67 +24,46 @@
 #include <sigrok.h>
 #include "config.h"
 
-static int init(struct output *o)
-{
-	/* Prevent compiler warnings. */
-	o = o;
-
-	/* Nothing so far, but we might want to add stuff here later. */
-	return 0;
-}
-
-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;
-	int outlen = 1; /* FIXME */
 
 	/* Prevent compiler warnings. */
 	o = o;
-	event_type = event_type;
 
-	switch(event_type) {
-	case DF_TRIGGER:
-		break;
-	case DF_END:
-		outbuf = calloc(1, outlen); /* FIXME */
-		if (outbuf == NULL)
-			return SIGROK_ERR_MALLOC;
-		*data_out = outbuf;
-		*length_out = outlen;
-		break;
+	if (!data_in) {
+		g_warning("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) {
+		g_warning("binary output: %s: length_out was NULL", __func__);
+		return SR_ERR;
+	}
 
-	/* Prevent compiler warnings. */
-	o = o;
+	if (length_in == 0) {
+		g_warning("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))) {
+		g_warning("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",
-	init,
-	data,
-	event,
+struct sr_output_format output_binary = {
+	.id = "binary",
+	.description = "Raw binary",
+	.df_type = SR_DF_LOGIC,
+	.init = NULL,
+	.data = data,
+	.event = NULL,
 };