output/hex: Rewrite for new output API.

[libsigrok.git] / output / binary.c

diff --git a/output/binary.c b/output/binary.c
index 2fd858eb5e3466c53b3ed7bb8dce97cd34373545..bad93f28dfb1698698680fb66f80dd053a899e44 100644 (file)
--- a/output/binary.c
+++ b/output/binary.c
@@ -24,45 +24,21 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "output/binary: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX 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_dev_inst *sdi,
+               const struct sr_datafeed_packet *packet, GString **out)
 {
-       uint8_t *outbuf;
+       const struct sr_datafeed_logic *logic;
 
        (void)o;
+       (void)sdi;
 
-       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;
 }
@@ -72,6 +48,5 @@ SR_PRIV struct sr_output_format output_binary = {
        .description = "Raw binary",
        .df_type = SR_DF_LOGIC,
        .init = NULL,
-       .data = data,
-       .event = NULL,
+       .receive = receive,
 };