X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=strutil.c;h=9ad83d7f7804433cd0ec595aa901520be0a0d919;hb=606a07b670270b4bcf0bfa4ffcf67dfd1cfedad3;hp=f8a52918deee38adef0217760a16dcd5ceabb456;hpb=0aeb0ccd5572a08c088e7903321a5998374f42e6;p=libsigrok.git

diff --git a/strutil.c b/strutil.c
index f8a52918..9ad83d7f 100644
--- a/strutil.c
+++ b/strutil.c
@@ -21,8 +21,8 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 
 /**
  * Convert a numeric samplerate value to its "natural" string representation.
@@ -110,6 +110,45 @@ SR_API char *sr_period_string(uint64_t frequency)
 	return o;
 }
 
+/**
+ * Convert a numeric frequency value to the "natural" string representation
+ * of its voltage value.
+ *
+ * E.g. a value of 300000 would be converted to "300mV", 2 to "2V".
+ *
+ * @param voltage The voltage represented as a rational number, with the
+ *                denominator a divisor of 1V.
+ *
+ * @return A g_try_malloc()ed string representation of the voltage value,
+ *         or NULL upon errors. The caller is responsible to g_free() the
+ *         memory.
+ */
+SR_API char *sr_voltage_string(struct sr_rational *voltage)
+{
+	char *o;
+	int r;
+
+	if (!(o = g_try_malloc0(30 + 1))) {
+		sr_err("strutil: %s: o malloc failed", __func__);
+		return NULL;
+	}
+
+	if (voltage->q == 1000)
+		r = snprintf(o, 30, "%" PRIu64 "mV", voltage->p);
+	else if (voltage->q == 1)
+		r = snprintf(o, 30, "%" PRIu64 "V", voltage->p);
+	else
+		r = -1;
+
+	if (r < 0) {
+		/* Something went wrong... */
+		g_free(o);
+		return NULL;
+	}
+
+	return o;
+}
+
 /**
  * Parse a trigger specification string.
  *
@@ -131,16 +170,17 @@ SR_API char *sr_period_string(uint64_t frequency)
  *         contain the respective trigger type which is requested for the
  *         respective probe (e.g. "r", "c", and so on).
  */
-SR_API char **sr_parse_triggerstring(struct sr_dev *dev,
+SR_API char **sr_parse_triggerstring(const struct sr_dev_inst *sdi,
 				     const char *triggerstring)
 {
 	GSList *l;
 	struct sr_probe *probe;
 	int max_probes, probenum, i;
-	char **tokens, **triggerlist, *trigger, *tc, *trigger_types;
+	char **tokens, **triggerlist, *trigger, *tc;
+	const char *trigger_types;
 	gboolean error;
 
-	max_probes = g_slist_length(dev->probes);
+	max_probes = g_slist_length(sdi->probes);
 	error = FALSE;
 
 	if (!(triggerlist = g_try_malloc0(max_probes * sizeof(char *)))) {
@@ -148,20 +188,18 @@ SR_API char **sr_parse_triggerstring(struct sr_dev *dev,
 		return NULL;
 	}
 
-	tokens = g_strsplit(triggerstring, ",", max_probes);
-
-	trigger_types = dev->driver->dev_info_get(0, SR_DI_TRIGGER_TYPES);
-	if (!trigger_types) {
-		sr_err("strutil: %s: Device doesn't support any triggers.",
-		       __func__);
+	if (sdi->driver->info_get(SR_DI_TRIGGER_TYPES,
+			(const void **)&trigger_types, sdi) != SR_OK) {
+		sr_err("strutil: %s: Device doesn't support any triggers.", __func__);
 		return NULL;
 	}
 
+	tokens = g_strsplit(triggerstring, ",", max_probes);
 	for (i = 0; tokens[i]; i++) {
 		if (tokens[i][0] < '0' || tokens[i][0] > '9') {
 			/* Named probe */
 			probenum = 0;
-			for (l = dev->probes; l; l = l->next) {
+			for (l = sdi->probes; l; l = l->next) {
 				probe = (struct sr_probe *)l->data;
 				if (probe->enabled
 				    && !strncmp(probe->name, tokens[i],
@@ -174,7 +212,7 @@ SR_API char **sr_parse_triggerstring(struct sr_dev *dev,
 			probenum = strtol(tokens[i], NULL, 10);
 		}
 
-		if (probenum < 1 || probenum > max_probes) {
+		if (probenum < 0 || probenum >= max_probes) {
 			sr_err("strutil: Invalid probe (%d).", probenum);
 			error = TRUE;
 			break;
@@ -190,7 +228,7 @@ SR_API char **sr_parse_triggerstring(struct sr_dev *dev,
 				}
 			}
 			if (!error)
-				triggerlist[probenum - 1] = g_strdup(trigger);
+				triggerlist[probenum] = g_strdup(trigger);
 		}
 	}
 	g_strfreev(tokens);
@@ -306,11 +344,66 @@ SR_API gboolean sr_parse_boolstring(const char *boolstr)
 	if (!boolstr)
 		return FALSE;
 
-	if (!g_strcasecmp(boolstr, "true") ||
-	    !g_strcasecmp(boolstr, "yes") ||
-	    !g_strcasecmp(boolstr, "on") ||
-	    !g_strcasecmp(boolstr, "1"))
+	if (!g_ascii_strncasecmp(boolstr, "true", 4) ||
+	    !g_ascii_strncasecmp(boolstr, "yes", 3) ||
+	    !g_ascii_strncasecmp(boolstr, "on", 2) ||
+	    !g_ascii_strncasecmp(boolstr, "1", 1))
 		return TRUE;
 
 	return FALSE;
 }
+
+SR_API int sr_parse_period(const char *periodstr, struct sr_rational *r)
+{
+	char *s;
+
+	r->p = strtoull(periodstr, &s, 10);
+	if (r->p == 0 && s == periodstr)
+		/* No digits found. */
+		return SR_ERR_ARG;
+
+	if (s && *s) {
+		while (*s == ' ')
+			s++;
+		if (!strcmp(s, "ns"))
+			r->q = 1000000000L;
+		else if (!strcmp(s, "us"))
+			r->q = 1000000;
+		else if (!strcmp(s, "ms"))
+			r->q = 1000;
+		else if (!strcmp(s, "s"))
+			r->q = 1;
+		else
+			/* Must have a time suffix. */
+			return SR_ERR_ARG;
+	}
+
+	return SR_OK;
+}
+
+
+SR_API int sr_parse_voltage(const char *voltstr, struct sr_rational *r)
+{
+	char *s;
+
+	r->p = strtoull(voltstr, &s, 10);
+	if (r->p == 0 && s == voltstr)
+		/* No digits found. */
+		return SR_ERR_ARG;
+
+	if (s && *s) {
+		while (*s == ' ')
+			s++;
+		if (!strcasecmp(s, "mv"))
+			r->q = 1000L;
+		else if (!strcasecmp(s, "v"))
+			r->q = 1;
+		else
+			/* Must have a base suffix. */
+			return SR_ERR_ARG;
+	}
+
+	return SR_OK;
+}
+
+