X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Ftext%2Fascii.c;h=2fed35d8b4e9e2515059f9012c23efe4565ce678;hb=40830061eb3a1327c1a8c76758e84b252e1950a8;hp=dd4373f46d574822712039c33470f30b2cc2fc5b;hpb=054e67090641e0a56a7e55789a3882ca138a0b11;p=libsigrok.git

diff --git a/output/text/ascii.c b/output/text/ascii.c
index dd4373f4..2fed35d8 100644
--- a/output/text/ascii.c
+++ b/output/text/ascii.c
@@ -21,10 +21,19 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 #include "text.h"
 
+/* Message logging helpers with driver-specific prefix string. */
+#define DRIVER_LOG_DOMAIN "output/ascii: "
+#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)
+
 SR_PRIV int init_ascii(struct sr_output *o)
 {
 	return init(o, DEFAULT_BPL_ASCII, MODE_ASCII);
@@ -51,7 +60,7 @@ SR_PRIV int data_ascii(struct sr_output *o, const uint8_t *data_in,
             * (ctx->num_enabled_probes * max_linelen);
 
 	if (!(outbuf = g_try_malloc0(outsize + 1))) {
-		sr_err("ascii out: %s: outbuf malloc failed", __func__);
+		sr_err("%s: outbuf malloc failed", __func__);
 		return SR_ERR_MALLOC;
 	}
 
@@ -108,8 +117,7 @@ SR_PRIV int data_ascii(struct sr_output *o, const uint8_t *data_in,
 			ctx->prevsample = sample;
 		}
 	} else {
-		sr_info("ascii out: short buffer (length_in=%" PRIu64 ")",
-			length_in);
+		sr_info("Short buffer (length_in=%" PRIu64 ").", length_in);
 	}
 
 	*data_out = outbuf;