X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Fascii.c;h=ba9acf9d5e99fb16cdd9771deb96b6464c3dd980;hb=f9c6b5cfd3c0f6cb737f6a68f69034ce6819f36d;hp=d2ad3acae449d45461e83bf680b2e873b365d6e2;hpb=1beccaed464a4d92a070988a0331fe399f9f7a7a;p=libsigrok.git

diff --git a/src/output/ascii.c b/src/output/ascii.c
index d2ad3aca..ba9acf9d 100644
--- a/src/output/ascii.c
+++ b/src/output/ascii.c
@@ -18,10 +18,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/hex"
@@ -107,7 +108,7 @@ static GString *gen_header(const struct sr_output *o)
 	}
 
 	header = g_string_sized_new(512);
-	g_string_printf(header, "%s\n", PACKAGE_STRING);
+	g_string_printf(header, "%s %s\n", PACKAGE_NAME, SR_PACKAGE_VERSION_STRING);
 	num_channels = g_slist_length(o->sdi->channels);
 	g_string_append_printf(header, "Acquisition with %d/%d channels",
 			ctx->num_enabled_channels, num_channels);
@@ -181,7 +182,7 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
 					/* Flush line buffers. */
 					g_string_append_len(*out, ctx->lines[j]->str, ctx->lines[j]->len);
 					g_string_append_c(*out, '\n');
-					if (j == ctx->num_enabled_channels  - 1 && ctx->trigger > -1) {
+					if (j == ctx->num_enabled_channels - 1 && ctx->trigger > -1) {
 						offset = ctx->trigger + ctx->trigger / 8;
 						g_string_append_printf(*out, "T:%*s^ %d\n", offset, "", ctx->trigger);
 						ctx->trigger = -1;
@@ -253,6 +254,7 @@ SR_PRIV struct sr_output_module output_ascii = {
 	.name = "ASCII",
 	.desc = "ASCII art",
 	.exts = (const char*[]){"txt", NULL},
+	.flags = 0,
 	.options = get_options,
 	.init = init,
 	.receive = receive,