X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Ftext%2Fbits.c;h=e0a9812c94aed21e904dae0b779a3e45d2c8ec2a;hb=ec29a878e0ca0b18969b00274744d0788234b54d;hp=3b75e5f370aa02243009e032152f97ac34438cf4;hpb=542dbd185b2e01e61df8a70a2ab850f5cfe03271;p=libsigrok.git diff --git a/output/text/bits.c b/output/text/bits.c index 3b75e5f3..e0a9812c 100644 --- a/output/text/bits.c +++ b/output/text/bits.c @@ -25,14 +25,14 @@ #include "libsigrok-internal.h" #include "text.h" -/* Message logging helpers with driver-specific prefix string. */ -#define DRIVER_LOG_DOMAIN "output/bits: " -#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/bits: " +#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 int init_bits(struct sr_output *o) { @@ -70,10 +70,6 @@ SR_PRIV int data_bits(struct sr_output *o, const uint8_t *data_in, strncpy((char *)outbuf, ctx->header, outsize); g_free(ctx->header); ctx->header = NULL; - - /* Ensure first transition. */ - memcpy(&ctx->prevsample, data_in, ctx->unitsize); - ctx->prevsample = ~ctx->prevsample; } if (length_in >= ctx->unitsize) { @@ -120,4 +116,5 @@ SR_PRIV struct sr_output_format output_text_bits = { .init = init_bits, .data = data_bits, .event = event, + .cleanup = text_cleanup, };