output/bits: Rewrite for new output API.

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

diff --git a/output/text/bits.c b/output/text/bits.c
deleted file mode 100644 (file)
index 4ab5925..0000000
--- a/output/text/bits.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * This file is part of the libsigrok project.
- *
- * 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
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include <glib.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 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;
-       const uint8_t *sample;
-       uint8_t *outbuf, c;
-
-       ctx = o->internal;
-       max_linelen = SR_MAX_CHANNELNAME_LEN + 3 + ctx->samples_per_line
-                       + ctx->samples_per_line / 8;
-        /*
-         * Calculate space needed for channels. Set aside 512 bytes for
-         * extra output, e.g. trigger.
-         */
-       outsize = 512 + (1 + (length_in / ctx->unitsize) / ctx->samples_per_line)
-            * (ctx->num_enabled_channels * max_linelen);
-
-       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((char *)outbuf, ctx->header, outsize);
-               g_free(ctx->header);
-               ctx->header = NULL;
-       }
-
-       if (length_in >= ctx->unitsize) {
-               for (offset = 0; offset <= length_in - ctx->unitsize;
-                    offset += ctx->unitsize) {
-                       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;
-                       }
-                       ctx->line_offset++;
-                       ctx->spl_cnt++;
-
-                       /* Add a space every 8th bit. */
-                       if ((ctx->spl_cnt & 7) == 0) {
-                               for (p = 0; p < ctx->num_enabled_channels; p++)
-                                       ctx->linebuf[p * ctx->linebuf_len +
-                                                    ctx->line_offset] = ' ';
-                               ctx->line_offset++;
-                       }
-
-                       /* End of line. */
-                       if (ctx->spl_cnt >= ctx->samples_per_line) {
-                               flush_linebufs(ctx, outbuf);
-                               ctx->line_offset = ctx->spl_cnt = 0;
-                               ctx->mark_trigger = -1;
-                       }
-               }
-       } else {
-               sr_info("Short buffer (length_in=%" PRIu64 ").", length_in);
-       }
-
-       *data_out = outbuf;
-       *length_out = strlen((const char *)outbuf);
-
-       return SR_OK;
-}
-
-SR_PRIV struct sr_output_format output_text_bits = {
-       .id = "bits",
-       .description = "Bits",
-       .df_type = SR_DF_LOGIC,
-       .init = init_bits,
-       .data = data_bits,
-       .event = event,
-       .cleanup = text_cleanup,
-};