/*
- * 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) 2013 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 <stdio.h>
#include <string.h>
#include <glib.h>
-#include "config.h"
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "config.h" /* Needed for PACKAGE_STRING and others. */
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
#include "text.h"
-SR_PRIV void flush_linebufs(struct context *ctx, char *outbuf)
+/* Message logging helpers with subsystem-specific prefix string. */
+#define LOG_PREFIX "output/text: "
+#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)
+
+SR_PRIV void flush_linebufs(struct context *ctx, uint8_t *outbuf)
{
static int max_probename_len = 0;
int len, i;
+ GSList *l;
+ char *probe_name;
if (ctx->linebuf[0] == 0)
return;
if (max_probename_len == 0) {
/* First time through... */
- for (i = 0; ctx->probelist[i]; i++) {
- len = strlen(ctx->probelist[i]);
+ for (l = ctx->probenames; l; l = l->next) {
+ probe_name = l->data;
+ len = strlen(probe_name);
if (len > max_probename_len)
max_probename_len = len;
}
}
- for (i = 0; ctx->probelist[i]; i++) {
- sprintf(outbuf + strlen(outbuf), "%*s:%s\n", max_probename_len,
- ctx->probelist[i], ctx->linebuf + i * ctx->linebuf_len);
+ for (i = 0, l = ctx->probenames; l; l = l->next, i++) {
+ probe_name = l->data;
+ sprintf((char *)outbuf + strlen((const char *)outbuf),
+ "%*s:%s\n", max_probename_len,
+ probe_name, ctx->linebuf + i * ctx->linebuf_len);
}
/* Mark trigger with a ^ character. */
if (ctx->mode == MODE_ASCII)
space_offset = 0;
- sprintf(outbuf + strlen(outbuf), "T:%*s^\n",
- ctx->mark_trigger + space_offset, "");
+ sprintf((char *)outbuf + strlen((const char *)outbuf),
+ "T:%*s^\n", ctx->mark_trigger + space_offset, "");
}
memset(ctx->linebuf, 0, i * ctx->linebuf_len);
struct context *ctx;
struct sr_probe *probe;
GSList *l;
+ GVariant *gvar;
uint64_t samplerate;
- int num_probes;
+ int num_probes, ret;
char *samplerate_s;
if (!(ctx = g_try_malloc0(sizeof(struct context)))) {
- sr_err("text out: %s: ctx malloc failed", __func__);
+ sr_err("%s: ctx malloc failed", __func__);
return SR_ERR_MALLOC;
}
o->internal = ctx;
ctx->num_enabled_probes = 0;
+ ctx->probenames = NULL;
- for (l = o->device->probes; l; l = l->next) {
+ for (l = o->sdi->probes; l; l = l->next) {
probe = l->data;
if (!probe->enabled)
continue;
- ctx->probelist[ctx->num_enabled_probes++] = probe->name;
+ ctx->probenames = g_slist_append(ctx->probenames, probe->name);
+ ctx->num_enabled_probes++;
}
- ctx->probelist[ctx->num_enabled_probes] = 0;
ctx->unitsize = (ctx->num_enabled_probes + 7) / 8;
ctx->line_offset = 0;
ctx->spl_cnt = 0;
ctx->mark_trigger = -1;
ctx->mode = mode;
+ ret = SR_OK;
if (o->param && o->param[0]) {
ctx->samples_per_line = strtoul(o->param, NULL, 10);
- if (ctx->samples_per_line < 1)
- return SR_ERR;
+ if (ctx->samples_per_line < 1) {
+ ret = SR_ERR;
+ goto err;
+ }
} else
ctx->samples_per_line = default_spl;
if (!(ctx->header = g_try_malloc0(512))) {
- g_free(ctx);
- sr_err("text out: %s: ctx->header malloc failed", __func__);
- return SR_ERR_MALLOC;
+ sr_err("%s: ctx->header malloc failed", __func__);
+ ret = SR_ERR_MALLOC;
+ goto err;
}
snprintf(ctx->header, 511, "%s\n", PACKAGE_STRING);
- num_probes = g_slist_length(o->device->probes);
- if (o->device->plugin || sr_dev_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) {
- samplerate = *((uint64_t *) o->device->plugin->get_device_info(
- o->device->plugin_index, SR_DI_CUR_SAMPLERATE));
+ num_probes = g_slist_length(o->sdi->probes);
+ if (sr_config_get(o->sdi->driver, o->sdi, NULL, SR_CONF_SAMPLERATE,
+ &gvar) == SR_OK) {
+ samplerate = g_variant_get_uint64(gvar);
+ g_variant_unref(gvar);
if (!(samplerate_s = sr_samplerate_string(samplerate))) {
- g_free(ctx->header);
- g_free(ctx);
- return SR_ERR;
+ ret = SR_ERR;
+ goto err;
}
snprintf(ctx->header + strlen(ctx->header),
511 - strlen(ctx->header),
ctx->linebuf_len = ctx->samples_per_line * 2 + 4;
if (!(ctx->linebuf = g_try_malloc0(num_probes * ctx->linebuf_len))) {
- g_free(ctx->header);
- g_free(ctx);
- sr_err("text out: %s: ctx->linebuf malloc failed", __func__);
- return SR_ERR_MALLOC;
+ sr_err("%s: ctx->linebuf malloc failed", __func__);
+ ret = SR_ERR_MALLOC;
+ goto err;
}
+
if (!(ctx->linevalues = g_try_malloc0(num_probes))) {
+ sr_err("%s: ctx->linevalues malloc failed", __func__);
+ ret = SR_ERR_MALLOC;
+ }
+
+ if (mode == MODE_ASCII &&
+ !(ctx->prevsample = g_try_malloc0(num_probes / 8))) {
+ sr_err("%s: ctx->prevsample malloc failed", __func__);
+ ret = SR_ERR_MALLOC;
+ }
+
+err:
+ if (ret != SR_OK) {
g_free(ctx->header);
g_free(ctx);
- sr_err("text out: %s: ctx->linevalues malloc failed", __func__);
- return SR_ERR_MALLOC;
}
- return SR_OK;
+ return ret;
}
-SR_PRIV int event(struct sr_output *o, int event_type, char **data_out,
+SR_PRIV int event(struct sr_output *o, int event_type, uint8_t **data_out,
uint64_t *length_out)
{
struct context *ctx;
int outsize;
- char *outbuf;
+ uint8_t *outbuf;
ctx = o->internal;
switch (event_type) {
outsize = ctx->num_enabled_probes
* (ctx->samples_per_line + 20) + 512;
if (!(outbuf = g_try_malloc0(outsize))) {
- sr_err("text out: %s: outbuf malloc failed", __func__);
+ sr_err("%s: outbuf malloc failed", __func__);
return SR_ERR_MALLOC;
}
flush_linebufs(ctx, outbuf);
*data_out = outbuf;
- *length_out = strlen(outbuf);
+ *length_out = strlen((const char *)outbuf);
g_free(o->internal);
o->internal = NULL;
break;
projects / libsigrok.git / blobdiff