sr_parse_(period|voltage): deprecate struct sr_rational

[libsigrok.git] / strutil.c

diff --git a/strutil.c b/strutil.c
index 1cb0db39efe1c1eb40870008e69452f83adc74e6..f9299ca6a08eec2219b9044c9e0657d8a1d18f24 100644 (file)
--- a/strutil.c
+++ b/strutil.c
@@ -24,6 +24,15 @@
 #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
  *
@@ -55,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)) {
@@ -79,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;
 }
 
@@ -120,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;
        }
 
@@ -157,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;
        }
 
@@ -170,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... */
@@ -208,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;
@@ -218,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++) {
@@ -242,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;
                }
@@ -250,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;
@@ -261,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++)
@@ -383,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;
@@ -412,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;
 
@@ -425,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;