X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=strutil.c;h=8abc556ec807875a0027c7e3a944d5d533436e8d;hb=e066c32a252f4e5cd881a270adb98b004e688427;hp=014c2c2ce16538dbacc1d72bd7276fb73f9c04c1;hpb=bf978d355345a7cc3ae7dc6199cc25952aaa182f;p=libsigrok.git diff --git a/strutil.c b/strutil.c index 014c2c2c..8abc556e 100644 --- a/strutil.c +++ b/strutil.c @@ -21,8 +21,54 @@ #include #include #include -#include "sigrok.h" -#include "sigrok-internal.h" +#include "libsigrok.h" +#include "libsigrok-internal.h" + +/** + * Convert a numeric value value to its "natural" string representation. + * in SI units + * + * E.g. a value of 3000000, with units set to "W", would be converted + * to "3 MW", 20000 to "20 kW", 31500 would become "31.5 kW". + * + * @param x The value to convert. + * @param unit The unit to append to the string, or NULL if the string + * has no units. + * + * @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. + */ +SR_API char *sr_si_string_u64(uint64_t x, const char *unit) +{ + if(unit == NULL) + unit = ""; + + if ((x >= SR_GHZ(1)) && (x % SR_GHZ(1) == 0)) { + return g_strdup_printf("%" PRIu64 " G%s", x / SR_GHZ(1), unit); + } else if ((x >= SR_GHZ(1)) && (x % SR_GHZ(1) != 0)) { + return g_strdup_printf("%" PRIu64 ".%" PRIu64 " G%s", + x / SR_GHZ(1), x % SR_GHZ(1), unit); + } else if ((x >= SR_MHZ(1)) && (x % SR_MHZ(1) == 0)) { + return g_strdup_printf("%" PRIu64 " M%s", + x / SR_MHZ(1), unit); + } else if ((x >= SR_MHZ(1)) && (x % SR_MHZ(1) != 0)) { + return g_strdup_printf("%" PRIu64 ".%" PRIu64 " M%s", + x / SR_MHZ(1), x % SR_MHZ(1), unit); + } else if ((x >= SR_KHZ(1)) && (x % SR_KHZ(1) == 0)) { + return g_strdup_printf("%" PRIu64 " k%s", + x / SR_KHZ(1), unit); + } else if ((x >= SR_KHZ(1)) && (x % SR_KHZ(1) != 0)) { + return g_strdup_printf("%" PRIu64 ".%" PRIu64 " k%s", + x / SR_KHZ(1), x % SR_KHZ(1), unit); + } else { + return g_strdup_printf("%" PRIu64 " %s", x, unit); + } + + sr_err("strutil: %s: Error creating SI units string.", + __func__); + return NULL; +} /** * Convert a numeric samplerate value to its "natural" string representation. @@ -38,35 +84,7 @@ */ SR_API char *sr_samplerate_string(uint64_t samplerate) { - char *o; - uint64_t s = samplerate; - - 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 (!o) { - sr_err("strutil: %s: Error creating samplerate string.", - __func__); - return NULL; - } - - return o; + return sr_si_string_u64(samplerate, "Hz"); } /** @@ -110,6 +128,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 +188,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 +206,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,8 +230,8 @@ SR_API char **sr_parse_triggerstring(struct sr_dev *dev, probenum = strtol(tokens[i], NULL, 10); } - if (probenum < 1 || probenum > max_probes) { - sr_err("strutil: Invalid probe (%d).\n", probenum); + if (probenum < 0 || probenum >= max_probes) { + sr_err("strutil: Invalid probe (%d).", probenum); error = TRUE; break; } @@ -184,13 +240,13 @@ SR_API char **sr_parse_triggerstring(struct sr_dev *dev, for (tc = ++trigger; *tc; tc++) { if (strchr(trigger_types, *tc) == NULL) { sr_err("strutil: Unsupported trigger " - "type '%c'.\n", *tc); + "type '%c'.", *tc); error = TRUE; break; } } if (!error) - triggerlist[probenum - 1] = g_strdup(trigger); + triggerlist[probenum] = g_strdup(trigger); } } g_strfreev(tokens); @@ -306,11 +362,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; +} + +