#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)
+#define LOG_PREFIX "output/text"
SR_PRIV void flush_linebufs(struct context *ctx, uint8_t *outbuf)
{
for (l = o->sdi->probes; l; l = l->next) {
probe = l->data;
+ if (probe->type != SR_PROBE_LOGIC)
+ continue;
if (!probe->enabled)
continue;
ctx->probenames = g_slist_append(ctx->probenames, probe->name);
snprintf(ctx->header, 511, "%s\n", PACKAGE_STRING);
num_probes = g_slist_length(o->sdi->probes);
- if (sr_config_get(o->sdi->driver, SR_CONF_SAMPLERATE, &gvar,
- o->sdi) == SR_OK) {
+ 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))) {
return ret;
}
+SR_PRIV int text_cleanup(struct sr_output *o)
+{
+ struct context *ctx;
+
+ if (!o)
+ return SR_ERR_ARG;
+
+ ctx = o->internal;
+
+ g_free(ctx->header);
+ g_free(ctx->linebuf);
+ g_free(ctx->linevalues);
+
+ if (ctx->prevsample)
+ g_free(ctx->prevsample);
+
+ g_slist_free(ctx->probenames);
+
+ g_free(ctx);
+
+ o->internal = NULL;
+
+ return SR_OK;
+}
+
SR_PRIV int event(struct sr_output *o, int event_type, uint8_t **data_out,
uint64_t *length_out)
{
flush_linebufs(ctx, outbuf);
*data_out = outbuf;
*length_out = strlen((const char *)outbuf);
- g_free(o->internal);
- o->internal = NULL;
break;
default:
*data_out = NULL;