X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Foutput%2Fbits.c;h=f29d57fa17aae4bb448e987eaf89e9f1da2e4b90;hb=49c45a5c64a031c4371710cad1e7a63c9d67c318;hp=e9eace0793702f7b8d531426767e40403f540329;hpb=d686c5ec462a4044e049931e57d60e9d08df8cde;p=libsigrok.git
diff --git a/src/output/bits.c b/src/output/bits.c
index e9eace07..f29d57fa 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"
@@ -29,7 +30,7 @@
struct context {
unsigned int num_enabled_channels;
- int samples_per_line;
+ int spl;
int spl_cnt;
int trigger;
uint64_t samplerate;
@@ -44,37 +45,15 @@ static int init(struct sr_output *o, GHashTable *options)
struct context *ctx;
struct sr_channel *ch;
GSList *l;
- GHashTableIter iter;
- gpointer key, value;
unsigned int i, j;
- uint32_t spl;
if (!o || !o->sdi)
return SR_ERR_ARG;
- spl = DEFAULT_SAMPLES_PER_LINE;
- if (options) {
- g_hash_table_iter_init(&iter, options);
- while (g_hash_table_iter_next(&iter, &key, &value)) {
- if (!strcmp(key, "width")) {
- if (!g_variant_is_of_type(value, G_VARIANT_TYPE_UINT32)) {
- sr_err("Invalid type for 'width' option.");
- return SR_ERR_ARG;
- }
- if (!(spl = g_variant_get_uint32(value))) {
- sr_err("Invalid width.");
- return SR_ERR_ARG;
- }
- } else {
- sr_err("Unknown option '%s'.", key);
- }
- }
- }
-
ctx = g_malloc0(sizeof(struct context));
o->priv = ctx;
ctx->trigger = -1;
- ctx->samples_per_line = spl;
+ ctx->spl = g_variant_get_uint32(g_hash_table_lookup(options, "width"));
for (l = o->sdi->channels; l; l = l->next) {
ch = l->data;
@@ -123,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_get());
num_channels = g_slist_length(o->sdi->channels);
g_string_append_printf(header, "Acquisition with %d/%d channels",
ctx->num_enabled_channels, num_channels);
@@ -184,11 +163,16 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
c = (*p & (1 << (idx % 8))) ? '1' : '0';
g_string_append_c(ctx->lines[j], c);
- if (ctx->spl_cnt == ctx->samples_per_line) {
+ if (ctx->spl_cnt == ctx->spl) {
/* 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;
@@ -199,7 +183,7 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
g_string_append_c(ctx->lines[j], ' ');
}
}
- if (ctx->spl_cnt == ctx->samples_per_line)
+ if (ctx->spl_cnt == ctx->spl)
/* Line buffers were already flushed. */
ctx->spl_cnt = 0;
}
@@ -243,16 +227,15 @@ 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(gboolean cached)
+static const struct sr_option *get_options(void)
{
- if (cached)
- return options;
-
- options[0].def = g_variant_new_uint32(DEFAULT_SAMPLES_PER_LINE);
- g_variant_ref_sink(options[0].def);
+ if (!options[0].def) {
+ options[0].def = g_variant_new_uint32(DEFAULT_SAMPLES_PER_LINE);
+ g_variant_ref_sink(options[0].def);
+ }
return options;
}
@@ -260,7 +243,9 @@ static struct sr_option *get_options(gboolean cached)
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,