X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Fbits.c;h=c3f2ef32dc26c53abf916c86b81d4c00eae07bcd;hb=5e5fde6e2c3aabfc61bcd35a53ab0d401b2176ba;hp=728ff2ffb3140c608f85e11492ed28a5f736eb6d;hpb=dcc55fe91aadf4396ce4a3b5db2898da39e1a6be;p=libsigrok.git
diff --git a/src/output/bits.c b/src/output/bits.c
index 728ff2ff..c3f2ef32 100644
--- a/src/output/bits.c
+++ b/src/output/bits.c
@@ -17,10 +17,11 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include
-#include "libsigrok.h"
+#include
#include "libsigrok-internal.h"
#define LOG_PREFIX "output/bits"
@@ -101,7 +102,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);
@@ -166,7 +167,12 @@ 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) {
+ /*
+ * Sample data lines have one character per bit,
+ * plus one separator per byte. Align trigger marker
+ * to this layout.
+ */
offset = ctx->trigger + ctx->trigger / 8;
g_string_append_printf(*out, "T:%*s^ %d\n", offset, "", ctx->trigger);
ctx->trigger = -1;
@@ -221,10 +227,10 @@ static int cleanup(struct sr_output *o)
static struct sr_option options[] = {
{ "width", "Width", "Number of samples per line", NULL, NULL },
- { 0 }
+ ALL_ZERO
};
-static struct sr_option *get_options(void)
+static const struct sr_option *get_options(void)
{
if (!options[0].def) {
options[0].def = g_variant_new_uint32(DEFAULT_SAMPLES_PER_LINE);
@@ -237,7 +243,9 @@ static struct sr_option *get_options(void)
SR_PRIV struct sr_output_module output_bits = {
.id = "bits",
.name = "Bits",
- .desc = "0/1 digits",
+ .desc = "0/1 digits logic data",
+ .exts = (const char*[]){"txt", NULL},
+ .flags = 0,
.options = get_options,
.init = init,
.receive = receive,