add DF_ANALOG, and an analog output module

[libsigrok.git] / output / output_text.c

diff --git a/output/output_text.c b/output/output_text.c
index fe212dfab897f3c62ebfac227acf5d4d68ad56b9..cc3cb4e19a406e413f4542bdc09fd1689851fc6c 100644 (file)
--- a/output/output_text.c
+++ b/output/output_text.c
@@ -63,7 +63,7 @@ static void flush_linebufs(struct context *ctx, char *outbuf)
                        ctx->probelist[i], ctx->linebuf + i * ctx->linebuf_len);
        }
 
-       /* Mark trigger with ^ */
+       /* Mark trigger with a ^ character. */
        if (ctx->mark_trigger != -1)
                sprintf(outbuf + strlen(outbuf), "T:%*s^\n",
                        ctx->mark_trigger + (ctx->mark_trigger / 8), "");
@@ -80,14 +80,17 @@ static int init(struct output *o, int default_spl)
        int num_probes;
        char *samplerate_s;
 
-       ctx = malloc(sizeof(struct context));
+       if (!(ctx = calloc(1, sizeof(struct context))))
+               return SIGROK_ERR_MALLOC;
+
        o->internal = ctx;
        ctx->num_enabled_probes = 0;
 
        for (l = o->device->probes; l; l = l->next) {
                probe = l->data;
-               if (probe->enabled)
-                       ctx->probelist[ctx->num_enabled_probes++] = probe->name;
+               if (!probe->enabled)
+                       continue;
+               ctx->probelist[ctx->num_enabled_probes++] = probe->name;
        }
 
        ctx->probelist[ctx->num_enabled_probes] = 0;
@@ -96,30 +99,48 @@ static int init(struct output *o, int default_spl)
        ctx->spl_cnt = 0;
        ctx->mark_trigger = -1;
 
-       if (o->param && o->param[0])
+       if (o->param && o->param[0]) {
                ctx->samples_per_line = strtoul(o->param, NULL, 10);
-       else
+               if (ctx->samples_per_line < 1)
+                       return SIGROK_ERR;
+       } else
                ctx->samples_per_line = default_spl;
 
-       ctx->header = malloc(512);
+       if (!(ctx->header = malloc(512))) {
+               free(ctx);
+               return SIGROK_ERR_MALLOC;
+       }
+
        snprintf(ctx->header, 511, "%s\n", PACKAGE_STRING);
        if (o->device->plugin) {
                num_probes = g_slist_length(o->device->probes);
                samplerate = *((uint64_t *) o->device->plugin->get_device_info(
                                o->device->plugin_index, DI_CUR_SAMPLERATE));
-               if ((samplerate_s = sigrok_samplerate_string(samplerate)) == NULL)
+               if (!(samplerate_s = sigrok_samplerate_string(samplerate))) {
+                       free(ctx->header);
+                       free(ctx);
                        return SIGROK_ERR;
-               snprintf(ctx->header + strlen(ctx->header), 511 - strlen(ctx->header),
-                               "Acquisition with %d/%d probes at %s\n", ctx->num_enabled_probes,
-                               num_probes, samplerate_s);
+               }
+               snprintf(ctx->header + strlen(ctx->header),
+                        511 - strlen(ctx->header),
+                        "Acquisition with %d/%d probes at %s\n",
+                        ctx->num_enabled_probes, num_probes, samplerate_s);
                free(samplerate_s);
        }
 
-       ctx->linebuf_len = ctx->samples_per_line * 2;
-       ctx->linebuf = calloc(1, num_probes * ctx->linebuf_len);
-       ctx->linevalues = calloc(1, num_probes);
+       ctx->linebuf_len = ctx->samples_per_line * 2 + 4;
+       if (!(ctx->linebuf = calloc(1, num_probes * ctx->linebuf_len))) {
+               free(ctx->header);
+               free(ctx);
+               return SIGROK_ERR_MALLOC;
+       }
+       if (!(ctx->linevalues = calloc(1, num_probes))) {
+               free(ctx->header);
+               free(ctx);
+               return SIGROK_ERR_MALLOC;
+       }
 
-       return 0;
+       return SIGROK_OK;
 }
 
 static int event(struct output *o, int event_type, char **data_out,
@@ -137,7 +158,8 @@ static int event(struct output *o, int event_type, char **data_out,
        case DF_END:
                outsize = ctx->num_enabled_probes
                                * (ctx->samples_per_line + 20) + 512;
-               outbuf = calloc(1, outsize);
+               if (!(outbuf = calloc(1, outsize)))
+                       return SIGROK_ERR_MALLOC;
                flush_linebufs(ctx, outbuf);
                *data_out = outbuf;
                *length_out = strlen(outbuf);
@@ -159,32 +181,35 @@ static int data_bits(struct output *o, char *data_in, uint64_t length_in,
 {
        struct context *ctx;
        unsigned int outsize, offset, p;
+       int max_linelen;
        uint64_t sample;
-       char *outbuf;
+       char *outbuf, c;
 
        ctx = o->internal;
-       outsize = length_in / ctx->unitsize * ctx->num_enabled_probes *
-                 ctx->samples_per_line + 512;
-       outbuf = calloc(1, outsize + 1);
+       max_linelen = MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
+                       + ctx->samples_per_line / 8;
+       outsize = length_in / ctx->unitsize * ctx->num_enabled_probes
+                       / ctx->samples_per_line * max_linelen + 512;
+
+       if (!(outbuf = calloc(1, outsize + 1)))
+               return SIGROK_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);
                ctx->header = NULL;
-       } else
-               outbuf[0] = 0;
+       }
 
        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++) {
-                               if (sample & ((uint64_t) 1 << p))
-                                       ctx->linebuf[p * ctx->linebuf_len +
-                                                    ctx->line_offset] = '1';
-                               else
-                                       ctx->linebuf[p * ctx->linebuf_len +
-                                                    ctx->line_offset] = '0';
+                               c = (sample & ((uint64_t) 1 << p)) ? '1' : '0';
+                               ctx->linebuf[p * ctx->linebuf_len +
+                                            ctx->line_offset] = c;
                        }
                        ctx->line_offset++;
                        ctx->spl_cnt++;
@@ -204,8 +229,9 @@ static int data_bits(struct output *o, char *data_in, uint64_t length_in,
                                ctx->mark_trigger = -1;
                        }
                }
-       } else
+       } else {
                g_message("short buffer (length_in=%" PRIu64 ")", length_in);
+       }
 
        *data_out = outbuf;
        *length_out = strlen(outbuf);
@@ -223,20 +249,26 @@ static int data_hex(struct output *o, char *data_in, uint64_t length_in,
 {
        struct context *ctx;
        unsigned int outsize, offset, p;
+       int max_linelen;
        uint64_t sample;
        char *outbuf;
 
        ctx = o->internal;
-       outsize = length_in / ctx->unitsize * ctx->num_enabled_probes *
-                 ctx->samples_per_line + 512;
-       outbuf = calloc(1, outsize + 1);
+       max_linelen = MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
+                       + ctx->samples_per_line / 2;
+       outsize = length_in / ctx->unitsize * ctx->num_enabled_probes
+                       / ctx->samples_per_line * max_linelen + 512;
+
+       if (!(outbuf = calloc(1, outsize + 1)))
+               return SIGROK_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);
                ctx->header = NULL;
-       } else
-               outbuf[0] = 0;
+       }
 
        ctx->line_offset = 0;
        for (offset = 0; offset <= length_in - ctx->unitsize;
@@ -275,6 +307,7 @@ static int data_hex(struct output *o, char *data_in, uint64_t length_in,
 struct output_format output_text_bits = {
        "bits",
        "Text (bits)",
+       DF_LOGIC,
        init_bits,
        data_bits,
        event,
@@ -283,6 +316,7 @@ struct output_format output_text_bits = {
 struct output_format output_text_hex = {
        "hex",
        "Text (hexadecimal)",
+       DF_LOGIC,
        init_hex,
        data_hex,
        event,