X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=strutil.c;h=1c3d023f014cae475df73389afcb029dfdb2737f;hb=8225e92175c64909eddaecf8bd512049acf653a2;hp=b8eb0f8e4b78c77ac34931f7caa3d2af173a0315;hpb=40f5ddac0125b1a7c9b2625dda631f3c0ba24a4b;p=libsigrok.git

diff --git a/strutil.c b/strutil.c
index b8eb0f8e..1c3d023f 100644
--- a/strutil.c
+++ b/strutil.c
@@ -60,7 +60,7 @@ char *sr_samplerate_string(uint64_t samplerate)
 }
 
 /**
- * Convert a numeric samplerate value to the "natural" string representation
+ * Convert a numeric frequency value to the "natural" string representation
  * of its period.
  *
  * E.g. a value of 3000000 would be converted to "3 us", 20000 to "50 ms".
@@ -96,10 +96,18 @@ char *sr_period_string(uint64_t frequency)
 	return o;
 }
 
-char **sr_parse_triggerstring(struct sr_device *device, const char *triggerstring)
+/**
+ * TODO
+ *
+ * @param device TODO
+ * @param triggerstring TODO
+ * @return TODO
+ */
+char **sr_parse_triggerstring(struct sr_device *device,
+			      const char *triggerstring)
 {
 	GSList *l;
-	struct probe *probe;
+	struct sr_probe *probe;
 	int max_probes, probenum, i;
 	char **tokens, **triggerlist, *trigger, *tc, *trigger_types;
 	gboolean error;
@@ -117,7 +125,7 @@ char **sr_parse_triggerstring(struct sr_device *device, const char *triggerstrin
 			/* Named probe */
 			probenum = 0;
 			for (l = device->probes; l; l = l->next) {
-				probe = (struct probe *)l->data;
+				probe = (struct sr_probe *)l->data;
 				if (probe->enabled
 				    && !strncmp(probe->name, tokens[i],
 						strlen(probe->name))) {
@@ -161,6 +169,21 @@ char **sr_parse_triggerstring(struct sr_device *device, const char *triggerstrin
 	return triggerlist;
 }
 
+/**
+ * Convert a "natural" string representation of a size value to uint64_t.
+ *
+ * E.g. a value of "3k" or "3 K" would be converted to 3000, a value
+ * of "15M" would be converted to 15000000.
+ *
+ * Value representations other than decimal (such as hex or octal) are not
+ * supported. Only 'k' (kilo), 'm' (mega), 'g' (giga) suffixes are supported.
+ * Spaces (but not other whitespace) between value and suffix are allowed.
+ *
+ * @param sizestring A string containing a (decimal) size value.
+ * @return The string's size value as uint64_t.
+ *
+ * TODO: Error handling.
+ */
 uint64_t sr_parse_sizestring(const char *sizestring)
 {
 	int multiplier;
@@ -197,6 +220,25 @@ uint64_t sr_parse_sizestring(const char *sizestring)
 	return val;
 }
 
+/**
+ * Convert a "natural" string representation of a time value to an
+ * uint64_t value in milliseconds.
+ *
+ * E.g. a value of "3s" or "3 s" would be converted to 3000, a value
+ * of "15ms" would be converted to 15.
+ *
+ * Value representations other than decimal (such as hex or octal) are not
+ * supported. Only lower-case "s" and "ms" time suffixes are supported.
+ * Spaces (but not other whitespace) between value and suffix are allowed.
+ *
+ * @param timestring A string containing a (decimal) time value.
+ * @return The string's time value as uint64_t, in milliseconds.
+ *
+ * TODO: Error handling.
+ * TODO: Add support for "m" (minutes) and others.
+ * TODO: picoseconds?
+ * TODO: Allow both lower-case and upper-case.
+ */
 uint64_t sr_parse_timestring(const char *timestring)
 {
 	uint64_t time_msec;
@@ -219,4 +261,3 @@ uint64_t sr_parse_timestring(const char *timestring)
 
 	return time_msec;
 }
-