Replace 'probe' with 'channel' in most places.

[libsigrok.git] / output / text / bits.c

diff --git a/output/text/bits.c b/output/text/bits.c
index bb90e1c912c5852212259d8b8bf7b2eab248f190..af3196925281977a03d734a90e699ecbbffd851e 100644 (file)
--- a/output/text/bits.c
+++ b/output/text/bits.c
@@ -1,7 +1,7 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
- * Copyright (C) 2011 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
  * Copyright (C) 2011 Håvard Espeland <gus@ping.uio.no>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -21,23 +21,26 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 #include "text.h"
 
+#define LOG_PREFIX "output/bits"
+
 SR_PRIV int init_bits(struct sr_output *o)
 {
        return init(o, DEFAULT_BPL_BITS, MODE_BITS);
 }
 
-SR_PRIV int data_bits(struct sr_output *o, const char *data_in,
-                     uint64_t length_in, char **data_out, uint64_t *length_out)
+SR_PRIV int data_bits(struct sr_output *o, const uint8_t *data_in,
+                     uint64_t length_in, uint8_t **data_out,
+                     uint64_t *length_out)
 {
        struct context *ctx;
        unsigned int outsize, offset, p;
        int max_linelen;
-       uint64_t sample;
-       char *outbuf, c;
+       const uint8_t *sample;
+       uint8_t *outbuf, c;
 
        ctx = o->internal;
        max_linelen = SR_MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
@@ -47,29 +50,27 @@ SR_PRIV int data_bits(struct sr_output *o, const char *data_in,
          * extra output, e.g. trigger.
          */
        outsize = 512 + (1 + (length_in / ctx->unitsize) / ctx->samples_per_line)
-            * (ctx->num_enabled_probes * max_linelen);
+            * (ctx->num_enabled_channels * max_linelen);
 
-       if (!(outbuf = calloc(1, outsize + 1)))
+       if (!(outbuf = g_try_malloc0(outsize + 1))) {
+               sr_err("%s: outbuf malloc failed", __func__);
                return SR_ERR_MALLOC;
+       }
 
        outbuf[0] = '\0';
        if (ctx->header) {
                /* The header is still here, this must be the first packet. */
-               strncpy(outbuf, ctx->header, outsize);
-               free(ctx->header);
+               strncpy((char *)outbuf, ctx->header, outsize);
+               g_free(ctx->header);
                ctx->header = NULL;
-
-               /* Ensure first transition. */
-               memcpy(&ctx->prevsample, data_in, ctx->unitsize);
-               ctx->prevsample = ~ctx->prevsample;
        }
 
        if (length_in >= ctx->unitsize) {
                for (offset = 0; offset <= length_in - ctx->unitsize;
                     offset += ctx->unitsize) {
-                       memcpy(&sample, data_in + offset, ctx->unitsize);
-                       for (p = 0; p < ctx->num_enabled_probes; p++) {
-                               c = (sample & ((uint64_t) 1 << p)) ? '1' : '0';
+                       sample = data_in + offset;
+                       for (p = 0; p < ctx->num_enabled_channels; p++) {
+                               c = (sample[p / 8] & ((uint8_t) 1 << (p % 8))) ? '1' : '0';
                                ctx->linebuf[p * ctx->linebuf_len +
                                             ctx->line_offset] = c;
                        }
@@ -78,7 +79,7 @@ SR_PRIV int data_bits(struct sr_output *o, const char *data_in,
 
                        /* Add a space every 8th bit. */
                        if ((ctx->spl_cnt & 7) == 0) {
-                               for (p = 0; p < ctx->num_enabled_probes; p++)
+                               for (p = 0; p < ctx->num_enabled_channels; p++)
                                        ctx->linebuf[p * ctx->linebuf_len +
                                                     ctx->line_offset] = ' ';
                                ctx->line_offset++;
@@ -92,20 +93,21 @@ SR_PRIV int data_bits(struct sr_output *o, const char *data_in,
                        }
                }
        } else {
-               sr_info("short buffer (length_in=%" PRIu64 ")", length_in);
+               sr_info("Short buffer (length_in=%" PRIu64 ").", length_in);
        }
 
        *data_out = outbuf;
-       *length_out = strlen(outbuf);
+       *length_out = strlen((const char *)outbuf);
 
        return SR_OK;
 }
 
 SR_PRIV struct sr_output_format output_text_bits = {
        .id = "bits",
-       .description = "Bits (takes argument, default 64)",
+       .description = "Bits",
        .df_type = SR_DF_LOGIC,
        .init = init_bits,
        .data = data_bits,
        .event = event,
+       .cleanup = text_cleanup,
 };