X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Finput.c;h=3bccdbc42540bf665140b4fad1b758533eca62e4;hb=33e4303baa3a33e5321bae9f3769deb6afd9b7a3;hp=d2c13aa79e18ac017feebbc20d51c9a9455b6762;hpb=0f3dbc9530b94a1cdefa97aee820e9de461cdb48;p=libsigrok.git

diff --git a/src/input/input.c b/src/input/input.c
index d2c13aa7..3bccdbc4 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -66,10 +66,10 @@ extern SR_PRIV struct sr_input_module input_wav;
 /* @endcond */
 
 static const struct sr_input_module *input_module_list[] = {
-//	&input_vcd,
+	&input_vcd,
 //	&input_chronovu_la8,
 	&input_wav,
-//	&input_csv,
+	&input_csv,
 	/* This one has to be last, because it will take any input. */
 //	&input_binary,
 	NULL,
@@ -157,39 +157,52 @@ SR_API const struct sr_input_module *sr_input_find(char *id)
  *
  * @since 0.4.0
  */
-SR_API const struct sr_option *sr_input_options_get(const struct sr_input_module *o)
+SR_API const struct sr_option **sr_input_options_get(const struct sr_input_module *imod)
 {
+	const struct sr_option *mod_opts, **opts;
+	int size, i;
 
-	if (!o || !o->options)
+	if (!imod || !imod->options)
 		return NULL;
 
-	return o->options();
+	mod_opts = imod->options();
+
+	for (size = 0; mod_opts[size].id; size++)
+		;
+	opts = g_malloc((size + 1) * sizeof(struct sr_option *));
+
+	for (i = 0; i < size; i++)
+		opts[i] = &mod_opts[i];
+	opts[i] = NULL;
+
+	return opts;
 }
 
 /**
  * After a call to sr_input_options_get(), this function cleans up all
- * resources allocated by that call.
+ * resources returned by that call.
  *
  * @since 0.4.0
  */
-SR_API void sr_input_options_free(const struct sr_input_module *o)
+SR_API void sr_input_options_free(const struct sr_option **options)
 {
-	struct sr_option *opt;
+	int i;
 
-	if (!o || !o->options)
+	if (!options)
 		return;
 
-	for (opt = o->options(); opt->id; opt++) {
-		if (opt->def) {
-			g_variant_unref(opt->def);
-			opt->def = NULL;
+	for (i = 0; options[i]; i++) {
+		if (options[i]->def) {
+			g_variant_unref(options[i]->def);
+			((struct sr_option *)options[i])->def = NULL;
 		}
 
-		if (opt->values) {
-			g_slist_free_full(opt->values, (GDestroyNotify)g_variant_unref);
-			opt->values = NULL;
+		if (options[i]->values) {
+			g_slist_free_full(options[i]->values, (GDestroyNotify)g_variant_unref);
+			((struct sr_option *)options[i])->values = NULL;
 		}
 	}
+	g_free(options);
 }
 
 /**
@@ -219,13 +232,13 @@ SR_API struct sr_input *sr_input_new(const struct sr_input_module *imod,
 	in = g_malloc0(sizeof(struct sr_input));
 	in->module = imod;
 
-	if (options) {
-		new_opts = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
-				(GDestroyNotify)g_variant_unref);
+	new_opts = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
+			(GDestroyNotify)g_variant_unref);
+	if (imod->options) {
 		mod_opts = imod->options();
 		for (i = 0; mod_opts[i].id; i++) {
-			if (g_hash_table_lookup_extended(options, mod_opts[i].id,
-					&key, &value)) {
+			if (options && g_hash_table_lookup_extended(options,
+					mod_opts[i].id, &key, &value)) {
 				/* Option not given: insert the default value. */
 				gvt = g_variant_get_type(mod_opts[i].def);
 				if (!g_variant_is_of_type(value, gvt)) {
@@ -243,25 +256,26 @@ SR_API struct sr_input *sr_input_new(const struct sr_input_module *imod,
 		}
 
 		/* Make sure no invalid options were given. */
-		g_hash_table_iter_init(&iter, options);
-		while (g_hash_table_iter_next(&iter, &key, &value)) {
-			if (!g_hash_table_lookup(new_opts, key)) {
-				sr_err("Input module '%s' has no option '%s'", imod->id, key);
-				g_hash_table_destroy(new_opts);
-				g_free(in);
-				return NULL;
+		if (options) {
+			g_hash_table_iter_init(&iter, options);
+			while (g_hash_table_iter_next(&iter, &key, &value)) {
+				if (!g_hash_table_lookup(new_opts, key)) {
+					sr_err("Input module '%s' has no option '%s'", imod->id, key);
+					g_hash_table_destroy(new_opts);
+					g_free(in);
+					return NULL;
+				}
 			}
 		}
-	} else
-		new_opts = NULL;
+	}
 
 	if (in->module->init && in->module->init(in, new_opts) != SR_OK) {
-		g_hash_table_destroy(new_opts);
 		g_free(in);
 		in = NULL;
 	}
 	if (new_opts)
 		g_hash_table_destroy(new_opts);
+	in->buf = g_string_sized_new(128);
 
 	return in;
 }
@@ -273,7 +287,7 @@ static gboolean check_required_metadata(const uint8_t *metadata, uint8_t *avail)
 	uint8_t reqd;
 
 	for (m = 0; metadata[m]; m++) {
-		if (!metadata[m] & SR_INPUT_META_REQUIRED)
+		if (!(metadata[m] & SR_INPUT_META_REQUIRED))
 			continue;
 		reqd = metadata[m] & ~SR_INPUT_META_REQUIRED;
 		for (a = 0; avail[a]; a++) {
@@ -298,6 +312,12 @@ static gboolean check_required_metadata(const uint8_t *metadata, uint8_t *avail)
  * If an input module is found, an instance is created and returned.
  * Otherwise, NULL is returned.
  *
+ * If an instance is created, it has the given buffer used for scanning
+ * already submitted to it, to be processed before more data is sent.
+ * This allows a frontend to submit an initial chunk of a non-seekable
+ * stream, such as stdin, without having to keep it around and submit
+ * it again later.
+ *
  */
 SR_API const struct sr_input *sr_input_scan_buffer(GString *buf)
 {
@@ -343,7 +363,7 @@ SR_API const struct sr_input *sr_input_scan_buffer(GString *buf)
 
 		/* Found a matching module. */
 		in = sr_input_new(imod, NULL);
-		in->buf = g_string_new_len(buf->str, buf->len);
+		g_string_insert_len(in->buf, 0, buf->str, buf->len);
 		break;
 	}
 
@@ -362,7 +382,7 @@ SR_API const struct sr_input *sr_input_scan_file(const char *filename)
 	struct sr_input *in;
 	const struct sr_input_module *imod;
 	GHashTable *meta;
-	GString *buf;
+	GString *header_buf;
 	struct stat st;
 	unsigned int midx, m, i;
 	int fd;
@@ -391,8 +411,10 @@ SR_API const struct sr_input *sr_input_scan_file(const char *filename)
 	/* TODO: MIME type */
 
 	in = NULL;
-	buf = NULL;
+	header_buf = g_string_sized_new(128);
 	for (i = 0; input_module_list[i]; i++) {
+		g_string_truncate(header_buf, 0);
+
 		imod = input_module_list[i];
 		if (!imod->metadata[0]) {
 			/* Module has no metadata for matching so will take
@@ -406,28 +428,30 @@ SR_API const struct sr_input *sr_input_scan_file(const char *filename)
 		meta = g_hash_table_new(NULL, NULL);
 		for (m = 0; m < sizeof(imod->metadata); m++) {
 			mitem = imod->metadata[m] & ~SR_INPUT_META_REQUIRED;
+			if (!mitem)
+				/* Metadata list is 0-terminated. */
+				break;
 			if (mitem == SR_INPUT_META_FILENAME)
 				g_hash_table_insert(meta, GINT_TO_POINTER(mitem),
 						(gpointer)filename);
-			else if (mitem == SR_INPUT_META_FILESIZE)
+			else if (mitem == SR_INPUT_META_FILESIZE) {
+				sr_dbg("inserting fs %d", st.st_size);
 				g_hash_table_insert(meta, GINT_TO_POINTER(mitem),
 						GINT_TO_POINTER(st.st_size));
-			else if (mitem == SR_INPUT_META_HEADER) {
-				buf = g_string_sized_new(128);
+			} else if (mitem == SR_INPUT_META_HEADER) {
 				if ((fd = open(filename, O_RDONLY)) < 0) {
 					sr_err("%s", strerror(errno));
 					return NULL;
 				}
-				size = read(fd, buf->str, 128);
-				buf->len = size;
+				size = read(fd, header_buf->str, 128);
+				header_buf->len = size;
 				close(fd);
 				if (size <= 0) {
-					g_string_free(buf, TRUE);
+					g_string_free(header_buf, TRUE);
 					sr_err("%s", strerror(errno));
 					return NULL;
 				}
-				g_hash_table_insert(meta, GINT_TO_POINTER(mitem), buf);
-				g_string_free(buf, TRUE);
+				g_hash_table_insert(meta, GINT_TO_POINTER(mitem), header_buf);
 			}
 		}
 		if (g_hash_table_size(meta) == 0) {
@@ -442,11 +466,9 @@ SR_API const struct sr_input *sr_input_scan_file(const char *filename)
 
 		/* Found a matching module. */
 		in = sr_input_new(imod, NULL);
-		in->buf = g_string_new_len(buf->str, buf->len);
 		break;
 	}
-	if (!in && buf)
-		g_string_free(buf, TRUE);
+	g_string_free(header_buf, TRUE);
 
 	return in;
 }
@@ -490,6 +512,8 @@ SR_API int sr_input_free(const struct sr_input *in)
 	ret = SR_OK;
 	if (in->module->cleanup)
 		ret = in->module->cleanup((struct sr_input *)in);
+	if (in->sdi)
+		sr_dev_inst_free(in->sdi);
 	if (in->buf)
 		g_string_free(in->buf, TRUE);
 	g_free((gpointer)in);