sr/cli/gtk/qt/: s/plugin/driver/.

[libsigrok.git] / strutil.c

diff --git a/strutil.c b/strutil.c
index 5e8689e7a17768fc5db21ce5f80e6323edb3b97f..57b4aa88e4532133f9409d0d46a41410ea668605 100644 (file)
--- a/strutil.c
+++ b/strutil.c
@@ -27,9 +27,11 @@
 /**
  * Convert a numeric samplerate value to its "natural" string representation.
  *
- * E.g. a value of 3000000 would be converted to "3 MHz", 20000 to "20 kHz".
+ * E.g. a value of 3000000 would be converted to "3 MHz", 20000 to "20 kHz",
+ * 31500 would become "31.5 kHz".
  *
  * @param samplerate The samplerate in Hz.
+ *
  * @return A g_try_malloc()ed string representation of the samplerate value,
  *         or NULL upon errors. The caller is responsible to g_free() the
  *         memory.
@@ -37,26 +39,30 @@
 SR_API char *sr_samplerate_string(uint64_t samplerate)
 {
        char *o;
-       int r;
+       uint64_t s = samplerate;
 
-       /* Allocate enough for a uint64_t as string + " GHz". */
-       if (!(o = g_try_malloc0(30 + 1))) {
-               sr_err("strutil: %s: o malloc failed", __func__);
-               return NULL;
+       if ((s >= SR_GHZ(1)) && (s % SR_GHZ(1) == 0)) {
+               o = g_strdup_printf("%" PRIu64 " GHz", s / SR_GHZ(1));
+       } else if ((s >= SR_GHZ(1)) && (s % SR_GHZ(1) != 0)) {
+               o = g_strdup_printf("%" PRIu64 ".%" PRIu64 " GHz",
+                                   s / SR_GHZ(1), s % SR_GHZ(1));
+       } else if ((s >= SR_MHZ(1)) && (s % SR_MHZ(1) == 0)) {
+               o = g_strdup_printf("%" PRIu64 " MHz", s / SR_MHZ(1));
+       } else if ((s >= SR_MHZ(1)) && (s % SR_MHZ(1) != 0)) {
+               o = g_strdup_printf("%" PRIu64 ".%" PRIu64 " MHz",
+                                   s / SR_MHZ(1), s % SR_MHZ(1));
+       } else if ((s >= SR_KHZ(1)) && (s % SR_KHZ(1) == 0)) {
+               o = g_strdup_printf("%" PRIu64 " kHz", s / SR_KHZ(1));
+       } else if ((s >= SR_KHZ(1)) && (s % SR_KHZ(1) != 0)) {
+               o = g_strdup_printf("%" PRIu64 ".%" PRIu64 " kHz",
+                                   s / SR_KHZ(1), s % SR_KHZ(1));
+       } else {
+               o = g_strdup_printf("%" PRIu64 " Hz", s);
        }
 
-       if (samplerate >= SR_GHZ(1))
-               r = snprintf(o, 30, "%" PRIu64 " GHz", samplerate / 1000000000);
-       else if (samplerate >= SR_MHZ(1))
-               r = snprintf(o, 30, "%" PRIu64 " MHz", samplerate / 1000000);
-       else if (samplerate >= SR_KHZ(1))
-               r = snprintf(o, 30, "%" PRIu64 " kHz", samplerate / 1000);
-       else
-               r = snprintf(o, 30, "%" PRIu64 " Hz", samplerate);
-
-       if (r < 0) {
-               /* Something went wrong... */
-               g_free(o);
+       if (!o) {
+               sr_err("strutil: %s: Error creating samplerate string.",
+                      __func__);
                return NULL;
        }
 
@@ -70,6 +76,7 @@ SR_API char *sr_samplerate_string(uint64_t samplerate)
  * E.g. a value of 3000000 would be converted to "3 us", 20000 to "50 ms".
  *
  * @param frequency The frequency in Hz.
+ *
  * @return A g_try_malloc()ed string representation of the frequency value,
  *         or NULL upon errors. The caller is responsible to g_free() the
  *         memory.
@@ -106,11 +113,12 @@ SR_API char *sr_period_string(uint64_t frequency)
 /**
  * TODO
  *
- * @param device TODO
+ * @param dev TODO
  * @param triggerstring TODO
+ *
  * @return TODO
  */
-SR_API char **sr_parse_triggerstring(struct sr_device *device,
+SR_API char **sr_parse_triggerstring(struct sr_dev *dev,
                                     const char *triggerstring)
 {
        GSList *l;
@@ -119,7 +127,7 @@ SR_API char **sr_parse_triggerstring(struct sr_device *device,
        char **tokens, **triggerlist, *trigger, *tc, *trigger_types;
        gboolean error;
 
-       max_probes = g_slist_length(device->probes);
+       max_probes = g_slist_length(dev->probes);
        error = FALSE;
 
        if (!(triggerlist = g_try_malloc0(max_probes * sizeof(char *)))) {
@@ -128,7 +136,7 @@ SR_API char **sr_parse_triggerstring(struct sr_device *device,
        }
 
        tokens = g_strsplit(triggerstring, ",", max_probes);
-       trigger_types = device->plugin->get_device_info(0, SR_DI_TRIGGER_TYPES);
+       trigger_types = dev->driver->dev_info_get(0, SR_DI_TRIGGER_TYPES);
        if (trigger_types == NULL)
                return NULL;
 
@@ -136,7 +144,7 @@ SR_API char **sr_parse_triggerstring(struct sr_device *device,
                if (tokens[i][0] < '0' || tokens[i][0] > '9') {
                        /* Named probe */
                        probenum = 0;
-                       for (l = device->probes; l; l = l->next) {
+                       for (l = dev->probes; l; l = l->next) {
                                probe = (struct sr_probe *)l->data;
                                if (probe->enabled
                                    && !strncmp(probe->name, tokens[i],
@@ -192,8 +200,8 @@ SR_API char **sr_parse_triggerstring(struct sr_device *device,
  *
  * @param sizestring A string containing a (decimal) size value.
  * @param size Pointer to uint64_t which will contain the string's size value.
- * @return SR_OK or error code
  *
+ * @return SR_OK upon success, SR_ERR upon errors.
  */
 SR_API int sr_parse_sizestring(const char *sizestring, uint64_t *size)
 {