X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Fbits.c;h=a26424d5968913a33ed86f8a6339c3a20f8c6b72;hb=3cd4b381744eb88fd4ba32565bd408c33b431629;hp=22212fd5cd205c088884ce396be49882ada6c4f2;hpb=950043c30ecd2a0d1d15a14f0d07f29b06157fc6;p=libsigrok.git

diff --git a/src/output/bits.c b/src/output/bits.c
index 22212fd5..a26424d5 100644
--- a/src/output/bits.c
+++ b/src/output/bits.c
@@ -29,7 +29,7 @@
 
 struct context {
 	unsigned int num_enabled_channels;
-	int samples_per_line;
+	int spl;
 	int spl_cnt;
 	int trigger;
 	uint64_t samplerate;
@@ -44,37 +44,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;
@@ -184,7 +162,7 @@ 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');
@@ -199,7 +177,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,10 +221,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);
@@ -260,6 +238,8 @@ SR_PRIV struct sr_output_module output_bits = {
 	.id = "bits",
 	.name = "Bits",
 	.desc = "0/1 digits",
+	.exts = (const char*[]){"txt", NULL},
+	.flags = 0,
 	.options = get_options,
 	.init = init,
 	.receive = receive,