/*
- * 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
#include <stdlib.h>
#include <string.h>
#include <glib.h>
-#include <sigrok.h>
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
#include "text.h"
+/* Message logging helpers with subsystem-specific prefix string. */
+#define LOG_PREFIX "output/ascii: "
+#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)
-int init_ascii(struct sr_output *o)
+SR_PRIV int init_ascii(struct sr_output *o)
{
return init(o, DEFAULT_BPL_ASCII, MODE_ASCII);
}
-int data_ascii(struct sr_output *o, const char *data_in, uint64_t length_in,
- char **data_out, uint64_t *length_out)
+SR_PRIV int data_ascii(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 / 8;
/*
* Calculate space needed for probes. Set aside 512 bytes for
outsize = 512 + (1 + (length_in / ctx->unitsize) / ctx->samples_per_line)
* (ctx->num_enabled_probes * 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;
}
if (length_in >= ctx->unitsize) {
for (offset = 0; offset <= length_in - ctx->unitsize;
offset += ctx->unitsize) {
- memcpy(&sample, data_in + offset, ctx->unitsize);
+ sample = data_in + offset;
char tmpval[ctx->num_enabled_probes];
for (p = 0; p < ctx->num_enabled_probes; p++) {
- uint64_t curbit = (sample & ((uint64_t) 1 << p));
- uint64_t prevbit = (ctx->prevsample &
- ((uint64_t) 1 << p));
+ uint8_t curbit = (sample[p / 8] & ((uint8_t) 1 << (p % 8)));
+ uint8_t prevbit = (ctx->prevsample[p / 8] &
+ ((uint8_t) 1 << (p % 8)));
if (curbit < prevbit && ctx->line_offset > 0) {
ctx->linebuf[p * ctx->linebuf_len +
ctx->line_offset++;
ctx->spl_cnt++;
- ctx->prevsample = sample;
+ memcpy(ctx->prevsample, sample, ctx->unitsize);
}
} else {
- g_message("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;
}
-
-struct sr_output_format output_text_ascii = {
- "ascii",
- "ASCII (takes argument, default 74)",
- SR_DF_LOGIC,
- init_ascii,
- data_ascii,
- event,
+SR_PRIV struct sr_output_format output_text_ascii = {
+ .id = "ascii",
+ .description = "ASCII",
+ .df_type = SR_DF_LOGIC,
+ .init = init_ascii,
+ .data = data_ascii,
+ .event = event,
};
-