X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fbinary.c;h=6e2531d1a252af1e7a92ed63e14c0b2783c0824f;hb=144f6660d004d60264a57db7150ed90e5f68ea77;hp=ef41dab4ef76c5c27e6185467c45282d8219a6b6;hpb=45c59c8bdd01954f9214fe7b869d92c55415d109;p=libsigrok.git

diff --git a/output/binary.c b/output/binary.c
index ef41dab4..6e2531d1 100644
--- a/output/binary.c
+++ b/output/binary.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2010 Uwe Hermann <uwe@hermann-uwe.de>
  *
@@ -24,37 +24,20 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-static int data(struct sr_output *o, const uint8_t *data_in,
-		uint64_t length_in, uint8_t **data_out, uint64_t *length_out)
+#define LOG_PREFIX "output/binary"
+
+static int receive(struct sr_output *o, const struct sr_datafeed_packet *packet,
+		GString **out)
 {
-	uint8_t *outbuf;
+	const struct sr_datafeed_logic *logic;
 
-	/* Prevent compiler warnings. */
 	(void)o;
 
-	if (!data_in) {
-		sr_err("binary out: %s: data_in was NULL", __func__);
-		return SR_ERR_ARG;
-	}
-
-	if (!length_out) {
-		sr_err("binary out: %s: length_out was NULL", __func__);
-		return SR_ERR_ARG;
-	}
-
-	if (length_in == 0) {
-		sr_err("binary out: %s: length_in was 0", __func__);
-		return SR_ERR_ARG;
-	}
-
-	if (!(outbuf = g_try_malloc0(length_in))) {
-		sr_err("binary out: %s: outbuf malloc failed", __func__);
-		return SR_ERR_MALLOC;
-	}
-
-	memcpy(outbuf, data_in, length_in);
-	*data_out = outbuf;
-	*length_out = length_in;
+	*out = NULL;
+	if (packet->type != SR_DF_LOGIC)
+		return SR_OK;
+	logic = packet->payload;
+	*out = g_string_new_len(logic->data, logic->length);
 
 	return SR_OK;
 }
@@ -62,8 +45,5 @@ static int data(struct sr_output *o, const uint8_t *data_in,
 SR_PRIV struct sr_output_format output_binary = {
 	.id = "binary",
 	.description = "Raw binary",
-	.df_type = SR_DF_LOGIC,
-	.init = NULL,
-	.data = data,
-	.event = NULL,
+	.receive = receive,
 };