X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=strutil.c;h=9ad83d7f7804433cd0ec595aa901520be0a0d919;hb=aee878fa2efb8483bf93fa3bb03508357fc713a8;hp=57b4aa88e4532133f9409d0d46a41410ea668605;hpb=c09f0b578c0e9c03590cb814f66004bb3f6815ff;p=libsigrok.git diff --git a/strutil.c b/strutil.c index 57b4aa88..9ad83d7f 100644 --- a/strutil.c +++ b/strutil.c @@ -21,8 +21,8 @@ #include #include #include -#include "sigrok.h" -#include "sigrok-internal.h" +#include "libsigrok.h" +#include "libsigrok-internal.h" /** * Convert a numeric samplerate value to its "natural" string representation. @@ -111,40 +111,95 @@ SR_API char *sr_period_string(uint64_t frequency) } /** - * TODO + * 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 dev TODO - * @param triggerstring TODO + * @param voltage The voltage represented as a rational number, with the + * denominator a divisor of 1V. * - * @return TODO + * @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_parse_triggerstring(struct sr_dev *dev, +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. + * + * @param dev The device for which the trigger specification is intended. + * @param triggerstring The string containing the trigger specification for + * one or more probes of this device. Entries for multiple probes are + * comma-separated. Triggers are specified in the form key=value, + * where the key is a probe number (or probe name) and the value is + * the requested trigger type. Valid trigger types currently + * include 'r' (rising edge), 'f' (falling edge), 'c' (any pin value + * change), '0' (low value), or '1' (high value). + * Example: "1=r,sck=f,miso=0,7=c" + * + * @return Pointer to a list of trigger types (strings), or NULL upon errors. + * The pointer list (if non-NULL) has as many entries as the + * respective device has probes (all physically available probes, + * not just enabled ones). Entries of the list which don't have + * a trigger value set in 'triggerstring' are NULL, the other entries + * 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(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 *)))) { - sr_err("session file: %s: metafile malloc failed", __func__); + sr_err("strutil: %s: triggerlist malloc failed", __func__); return NULL; } - tokens = g_strsplit(triggerstring, ",", max_probes); - trigger_types = dev->driver->dev_info_get(0, SR_DI_TRIGGER_TYPES); - if (trigger_types == 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__); 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], @@ -157,8 +212,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("Invalid probe.\n"); + if (probenum < 0 || probenum >= max_probes) { + sr_err("strutil: Invalid probe (%d).", probenum); error = TRUE; break; } @@ -166,14 +221,14 @@ SR_API char **sr_parse_triggerstring(struct sr_dev *dev, if ((trigger = strchr(tokens[i], '='))) { for (tc = ++trigger; *tc; tc++) { if (strchr(trigger_types, *tc) == NULL) { - sr_err("Unsupported trigger type " - "'%c'\n", *tc); + sr_err("strutil: Unsupported trigger " + "type '%c'.", *tc); error = TRUE; break; } } if (!error) - triggerlist[probenum - 1] = g_strdup(trigger); + triggerlist[probenum] = g_strdup(trigger); } } g_strfreev(tokens); @@ -289,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; +} + +