/*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
*
- * Copyright (C) 2010-2012 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 "libsigrok-internal.h"
#include "text.h"
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "output/text: "
-#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
-#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+/* 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++) {
+ 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,
- ctx->probelist[i], ctx->linebuf + i * ctx->linebuf_len);
+ probe_name, ctx->linebuf + i * ctx->linebuf_len);
}
/* Mark trigger with a ^ character. */
struct context *ctx;
struct sr_probe *probe;
GSList *l;
- uint64_t *samplerate;
+ GVariant *gvar;
+ uint64_t samplerate;
int num_probes, ret;
char *samplerate_s;
o->internal = ctx;
ctx->num_enabled_probes = 0;
+ ctx->probenames = NULL;
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;
snprintf(ctx->header, 511, "%s\n", PACKAGE_STRING);
num_probes = g_slist_length(o->sdi->probes);
- if (o->sdi->driver || sr_dev_has_option(o->sdi, SR_CONF_SAMPLERATE)) {
- ret = o->sdi->driver->config_get(SR_CONF_SAMPLERATE,
- (const void **)&samplerate, o->sdi);
- if (ret != SR_OK)
- goto err;
- if (!(samplerate_s = sr_samplerate_string(*samplerate))) {
+ if (sr_config_get(o->sdi->driver, SR_CONF_SAMPLERATE, &gvar,
+ o->sdi) == SR_OK) {
+ samplerate = g_variant_get_uint64(gvar);
+ g_variant_unref(gvar);
+ if (!(samplerate_s = sr_samplerate_string(samplerate))) {
ret = SR_ERR;
goto err;
}
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);