X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fbinary.c;h=6e2531d1a252af1e7a92ed63e14c0b2783c0824f;hb=43cd4637285833706f8a404ca027bcf0ee75b9ae;hp=43dbf7307985f61521832d90649acfd0ad641ca2;hpb=50985c2019b2b5a6ce394589d89ee925b4f5e3a9;p=libsigrok.git

diff --git a/output/binary.c b/output/binary.c
index 43dbf730..6e2531d1 100644
--- a/output/binary.c
+++ b/output/binary.c
@@ -24,45 +24,20 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "output/binary: "
-#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
-#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+#define LOG_PREFIX "output/binary"
 
-static int data(struct sr_output *o, const uint8_t *data_in,
-		uint64_t length_in, uint8_t **data_out, uint64_t *length_out)
+static int receive(struct sr_output *o, const struct sr_datafeed_packet *packet,
+		GString **out)
 {
-	uint8_t *outbuf;
+	const struct sr_datafeed_logic *logic;
 
 	(void)o;
 
-	if (!data_in) {
-		sr_err("%s: data_in was NULL", __func__);
-		return SR_ERR_ARG;
-	}
-
-	if (!length_out) {
-		sr_err("%s: length_out was NULL", __func__);
-		return SR_ERR_ARG;
-	}
-
-	if (length_in == 0) {
-		sr_err("%s: length_in was 0", __func__);
-		return SR_ERR_ARG;
-	}
-
-	if (!(outbuf = g_try_malloc0(length_in))) {
-		sr_err("%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;
 }
@@ -70,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,
 };