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

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

diff --git a/output/text/hex.c b/output/text/hex.c
index e63feb143e4f999467d8f6d85b69a87e86f86a94..e976e9ba445b0ef639e50824df4a82949ea974f4 100644 (file)
--- a/output/text/hex.c
+++ b/output/text/hex.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,57 +21,62 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include <sigrok.h>
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 #include "text.h"
 
+#define LOG_PREFIX "output/hex"
 
-int init_hex(struct sr_output *o)
+SR_PRIV int init_hex(struct sr_output *o)
 {
        return init(o, DEFAULT_BPL_HEX, MODE_HEX);
 }
 
-int data_hex(struct sr_output *o, char *data_in, uint64_t length_in,
-                   char **data_out, uint64_t *length_out)
+SR_PRIV int data_hex(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;
+       const uint8_t *sample;
+       uint8_t *outbuf;
 
        ctx = o->internal;
-       max_linelen = MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
+       max_linelen = SR_MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
                        + ctx->samples_per_line / 2;
-       outsize = length_in / ctx->unitsize * ctx->num_enabled_probes
+       outsize = length_in / ctx->unitsize * ctx->num_enabled_channels
                        / ctx->samples_per_line * max_linelen + 512;
 
-       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;
        }
 
        ctx->line_offset = 0;
        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++) {
+               sample = data_in + offset;
+               for (p = 0; p < ctx->num_enabled_channels; p++) {
                        ctx->linevalues[p] <<= 1;
-                       if (sample & ((uint64_t) 1 << p))
+                       if (sample[p / 8] & ((uint8_t) 1 << (p % 8)))
                                ctx->linevalues[p] |= 1;
-                       sprintf(ctx->linebuf + (p * ctx->linebuf_len) +
+                       sprintf((char *)ctx->linebuf + (p * ctx->linebuf_len) +
                                ctx->line_offset, "%.2x", ctx->linevalues[p]);
                }
                ctx->spl_cnt++;
 
                /* Add a space after every complete hex byte. */
                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 + 2] = ' ';
                        ctx->line_offset += 3;
@@ -85,18 +90,17 @@ int data_hex(struct sr_output *o, char *data_in, uint64_t length_in,
        }
 
        *data_out = outbuf;
-       *length_out = strlen(outbuf);
+       *length_out = strlen((const char *)outbuf);
 
        return SR_OK;
 }
 
-
-struct sr_output_format output_text_hex = {
-       "hex",
-       "Hexadecimal (takes argument, default 192)",
-       SR_DF_LOGIC,
-       init_hex,
-       data_hex,
-       event,
+SR_PRIV struct sr_output_format output_text_hex = {
+       .id = "hex",
+       .description = "Hexadecimal",
+       .df_type = SR_DF_LOGIC,
+       .init = init_hex,
+       .data = data_hex,
+       .event = event,
+       .cleanup = text_cleanup,
 };
-