#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.
*
*/
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");
}
/**
* 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;
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 *)))) {
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) {
- probe = (struct sr_probe *)l->data;
- if (probe->enabled
- && !strncmp(probe->name, tokens[i],
- strlen(probe->name))) {
- probenum = probe->index;
- break;
- }
+ probenum = -1;
+ for (l = sdi->probes; l; l = l->next) {
+ probe = (struct sr_probe *)l->data;
+ if (probe->enabled
+ && !strncmp(probe->name, tokens[i],
+ strlen(probe->name))) {
+ probenum = probe->index;
+ break;
}
- } else {
- probenum = strtol(tokens[i], NULL, 10);
}
- if (probenum < 1 || probenum > max_probes) {
- sr_err("strutil: Invalid probe (%d).", probenum);
+ if (probenum < 0 || probenum >= max_probes) {
+ sr_err("strutil: Invalid probe.");
error = TRUE;
break;
}
}
}
if (!error)
- triggerlist[probenum - 1] = g_strdup(trigger);
+ triggerlist[probenum] = g_strdup(trigger);
}
}
g_strfreev(tokens);
projects / libsigrok.git / blobdiff