X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Fbits.c;h=e9eace0793702f7b8d531426767e40403f540329;hb=a24c3f4a899d61a6bfc837a1969dbacf42e2ea72;hp=b44f1057d82c645676ec16a4c31094b3221060ea;hpb=155b680da482cea2381becb73c51cfb838bff31e;p=libsigrok.git

diff --git a/src/output/bits.c b/src/output/bits.c
index b44f1057..e9eace07 100644
--- a/src/output/bits.c
+++ b/src/output/bits.c
@@ -39,7 +39,7 @@ struct context {
 	GString **lines;
 };
 
-static int init(struct sr_output *o)
+static int init(struct sr_output *o, GHashTable *options)
 {
 	struct context *ctx;
 	struct sr_channel *ch;
@@ -47,27 +47,32 @@ static int init(struct sr_output *o)
 	GHashTableIter iter;
 	gpointer key, value;
 	unsigned int i, j;
-	int spl;
+	uint32_t spl;
 
 	if (!o || !o->sdi)
 		return SR_ERR_ARG;
 
 	spl = DEFAULT_SAMPLES_PER_LINE;
-	g_hash_table_iter_init(&iter, o->params);
-	while (g_hash_table_iter_next(&iter, &key, &value)) {
-		if (!strcmp(key, "width")) {
-			if ((spl = strtoul(value, NULL, 10)) < 1) {
-				sr_err("Invalid width.");
-				return SR_ERR_ARG;
+	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);
 			}
-		} else {
-			sr_err("Unknown parameter '%s'.", key);
-			return SR_ERR_ARG;
 		}
 	}
 
 	ctx = g_malloc0(sizeof(struct context));
-	o->internal = ctx;
+	o->priv = ctx;
 	ctx->trigger = -1;
 	ctx->samples_per_line = spl;
 
@@ -100,7 +105,7 @@ static int init(struct sr_output *o)
 	return SR_OK;
 }
 
-static GString *gen_header(struct sr_output *o)
+static GString *gen_header(const struct sr_output *o)
 {
 	struct context *ctx;
 	GVariant *gvar;
@@ -108,7 +113,7 @@ static GString *gen_header(struct sr_output *o)
 	int num_channels;
 	char *samplerate_s;
 
-	ctx = o->internal;
+	ctx = o->priv;
 	if (ctx->samplerate == 0) {
 		if (sr_config_get(o->sdi->driver, o->sdi, NULL, SR_CONF_SAMPLERATE,
 				&gvar) == SR_OK) {
@@ -132,7 +137,7 @@ static GString *gen_header(struct sr_output *o)
 	return header;
 }
 
-static int receive(struct sr_output *o, const struct sr_datafeed_packet *packet,
+static int receive(const struct sr_output *o, const struct sr_datafeed_packet *packet,
 		GString **out)
 {
 	const struct sr_datafeed_meta *meta;
@@ -147,7 +152,7 @@ static int receive(struct sr_output *o, const struct sr_datafeed_packet *packet,
 	*out = NULL;
 	if (!o || !o->sdi)
 		return SR_ERR_ARG;
-	if (!(ctx = o->internal))
+	if (!(ctx = o->priv))
 		return SR_ERR_ARG;
 
 	switch (packet->type) {
@@ -222,7 +227,7 @@ static int cleanup(struct sr_output *o)
 	if (!o)
 		return SR_ERR_ARG;
 
-	if (!(ctx = o->internal))
+	if (!(ctx = o->priv))
 		return SR_OK;
 
 	g_free(ctx->channel_index);
@@ -231,14 +236,32 @@ static int cleanup(struct sr_output *o)
 		g_string_free(ctx->lines[i], TRUE);
 	g_free(ctx->lines);
 	g_free(ctx);
-	o->internal = NULL;
+	o->priv = NULL;
 
 	return SR_OK;
 }
 
-SR_PRIV struct sr_output_format output_bits = {
+static struct sr_option options[] = {
+	{ "width", "Width", "Number of samples per line", NULL, NULL },
+	{ 0 }
+};
+
+static struct sr_option *get_options(gboolean cached)
+{
+	if (cached)
+		return options;
+
+	options[0].def = g_variant_new_uint32(DEFAULT_SAMPLES_PER_LINE);
+	g_variant_ref_sink(options[0].def);
+
+	return options;
+}
+
+SR_PRIV struct sr_output_module output_bits = {
 	.id = "bits",
-	.description = "Bits",
+	.name = "Bits",
+	.desc = "0/1 digits",
+	.options = get_options,
 	.init = init,
 	.receive = receive,
 	.cleanup = cleanup,