X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=strutil.c;h=f9299ca6a08eec2219b9044c9e0657d8a1d18f24;hb=e48a54629242584b7b2508d657815730ad80cbfe;hp=5be26bbc6ed57afac3b20b66a6b66c7fb5fb9ed6;hpb=9c5332d2915ba374775196b7e3624857d320b60a;p=libsigrok.git

diff --git a/strutil.c b/strutil.c
index 5be26bbc..f9299ca6 100644
--- a/strutil.c
+++ b/strutil.c
@@ -24,6 +24,21 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
+/* Message logging helpers with driver-specific prefix string. */
+#define DRIVER_LOG_DOMAIN "strutil: "
+#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
+#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+
+/**
+ * @file
+ *
+ * Helper functions for handling or converting libsigrok-related strings.
+ */
+
 /**
  * @defgroup grp_strutil String utilities
  *
@@ -49,7 +64,7 @@
  */
 SR_API char *sr_si_string_u64(uint64_t x, const char *unit)
 {
-	if(unit == NULL)
+	if (unit == NULL)
 		unit = "";
 
 	if ((x >= SR_GHZ(1)) && (x % SR_GHZ(1) == 0)) {
@@ -73,8 +88,7 @@ SR_API char *sr_si_string_u64(uint64_t x, const char *unit)
 		return g_strdup_printf("%" PRIu64 " %s", x, unit);
 	}
 
-	sr_err("strutil: %s: Error creating SI units string.",
-		__func__);
+	sr_err("%s: Error creating SI units string.", __func__);
 	return NULL;
 }
 
@@ -114,7 +128,7 @@ SR_API char *sr_period_string(uint64_t frequency)
 
 	/* Allocate enough for a uint64_t as string + " ms". */
 	if (!(o = g_try_malloc0(30 + 1))) {
-		sr_err("strutil: %s: o malloc failed", __func__);
+		sr_err("%s: o malloc failed", __func__);
 		return NULL;
 	}
 
@@ -151,11 +165,11 @@ SR_API char *sr_period_string(uint64_t frequency)
  */
 SR_API char *sr_voltage_string(struct sr_rational *voltage)
 {
-	char *o;
 	int r;
+	char *o;
 
 	if (!(o = g_try_malloc0(30 + 1))) {
-		sr_err("strutil: %s: o malloc failed", __func__);
+		sr_err("%s: o malloc failed", __func__);
 		return NULL;
 	}
 
@@ -164,7 +178,7 @@ SR_API char *sr_voltage_string(struct sr_rational *voltage)
 	else if (voltage->q == 1)
 		r = snprintf(o, 30, "%" PRIu64 "V", voltage->p);
 	else
-		r = -1;
+		r = snprintf(o, 30, "%gV", (float)voltage->p / (float)voltage->q);
 
 	if (r < 0) {
 		/* Something went wrong... */
@@ -202,6 +216,7 @@ SR_API char **sr_parse_triggerstring(const struct sr_dev_inst *sdi,
 				     const char *triggerstring)
 {
 	GSList *l;
+	GVariant *gvar;
 	struct sr_probe *probe;
 	int max_probes, probenum, i;
 	char **tokens, **triggerlist, *trigger, *tc;
@@ -212,15 +227,15 @@ SR_API char **sr_parse_triggerstring(const struct sr_dev_inst *sdi,
 	error = FALSE;
 
 	if (!(triggerlist = g_try_malloc0(max_probes * sizeof(char *)))) {
-		sr_err("strutil: %s: triggerlist malloc failed", __func__);
+		sr_err("%s: triggerlist malloc failed", __func__);
 		return NULL;
 	}
 
-	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__);
+	if (sdi->driver->config_list(SR_CONF_TRIGGER_TYPE, &gvar, sdi) != SR_OK) {
+		sr_err("%s: Device doesn't support any triggers.", __func__);
 		return NULL;
 	}
+	trigger_types = g_variant_get_string(gvar, NULL);
 
 	tokens = g_strsplit(triggerstring, ",", max_probes);
 	for (i = 0; tokens[i]; i++) {
@@ -236,7 +251,7 @@ SR_API char **sr_parse_triggerstring(const struct sr_dev_inst *sdi,
 		}
 
 		if (probenum < 0 || probenum >= max_probes) {
-			sr_err("strutil: Invalid probe.");
+			sr_err("Invalid probe.");
 			error = TRUE;
 			break;
 		}
@@ -244,7 +259,7 @@ SR_API char **sr_parse_triggerstring(const struct sr_dev_inst *sdi,
 		if ((trigger = strchr(tokens[i], '='))) {
 			for (tc = ++trigger; *tc; tc++) {
 				if (strchr(trigger_types, *tc) == NULL) {
-					sr_err("strutil: Unsupported trigger "
+					sr_err("Unsupported trigger "
 					       "type '%c'.", *tc);
 					error = TRUE;
 					break;
@@ -255,6 +270,7 @@ SR_API char **sr_parse_triggerstring(const struct sr_dev_inst *sdi,
 		}
 	}
 	g_strfreev(tokens);
+	g_variant_unref(gvar);
 
 	if (error) {
 		for (i = 0; i < max_probes; i++)
@@ -334,16 +350,17 @@ SR_API int sr_parse_sizestring(const char *sizestring, uint64_t *size)
  * @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.
+ * @todo Add support for "m" (minutes) and others.
+ * @todo Add support for picoseconds?
+ * @todo Allow both lower-case and upper-case? If no, document it.
  */
 SR_API uint64_t sr_parse_timestring(const char *timestring)
 {
 	uint64_t time_msec;
 	char *s;
 
+	/* TODO: Error handling, logging. */
+
 	time_msec = strtoull(timestring, &s, 10);
 	if (time_msec == 0 && s == timestring)
 		return 0;
@@ -376,26 +393,30 @@ SR_API gboolean sr_parse_boolstring(const char *boolstr)
 	return FALSE;
 }
 
-SR_API int sr_parse_period(const char *periodstr, struct sr_rational *r)
+SR_API int sr_parse_period(const char *periodstr, uint64_t *p, uint64_t *q)
 {
 	char *s;
 
-	r->p = strtoull(periodstr, &s, 10);
-	if (r->p == 0 && s == periodstr)
+	*p = strtoull(periodstr, &s, 10);
+	if (*p == 0 && s == periodstr)
 		/* No digits found. */
 		return SR_ERR_ARG;
 
 	if (s && *s) {
 		while (*s == ' ')
 			s++;
-		if (!strcmp(s, "ns"))
-			r->q = 1000000000L;
+		if (!strcmp(s, "fs"))
+			*q = 1000000000000000ULL;
+		else if (!strcmp(s, "ps"))
+			*q = 1000000000000ULL;
+		else if (!strcmp(s, "ns"))
+			*q = 1000000000ULL;
 		else if (!strcmp(s, "us"))
-			r->q = 1000000;
+			*q = 1000000;
 		else if (!strcmp(s, "ms"))
-			r->q = 1000;
+			*q = 1000;
 		else if (!strcmp(s, "s"))
-			r->q = 1;
+			*q = 1;
 		else
 			/* Must have a time suffix. */
 			return SR_ERR_ARG;
@@ -405,12 +426,12 @@ SR_API int sr_parse_period(const char *periodstr, struct sr_rational *r)
 }
 
 
-SR_API int sr_parse_voltage(const char *voltstr, struct sr_rational *r)
+SR_API int sr_parse_voltage(const char *voltstr, uint64_t *p, uint64_t *q)
 {
 	char *s;
 
-	r->p = strtoull(voltstr, &s, 10);
-	if (r->p == 0 && s == voltstr)
+	*p = strtoull(voltstr, &s, 10);
+	if (*p == 0 && s == voltstr)
 		/* No digits found. */
 		return SR_ERR_ARG;
 
@@ -418,9 +439,9 @@ SR_API int sr_parse_voltage(const char *voltstr, struct sr_rational *r)
 		while (*s == ' ')
 			s++;
 		if (!strcasecmp(s, "mv"))
-			r->q = 1000L;
+			*q = 1000L;
 		else if (!strcasecmp(s, "v"))
-			r->q = 1;
+			*q = 1;
 		else
 			/* Must have a base suffix. */
 			return SR_ERR_ARG;