/*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
*
* Copyright (C) 2010 Uwe Hermann <uwe@hermann-uwe.de>
*
#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)
+/* Message logging helpers with subsystem-specific prefix string. */
+#define LOG_PREFIX "strutil: "
+#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
+#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
+#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
+#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
+#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
+#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
/**
* @file
}
/**
- * Convert a numeric frequency value to the "natural" string representation
- * of its voltage value.
+ * Convert a numeric voltage value to the "natural" string representation
+ * of its voltage value. The voltage is specified as a rational number's
+ * numerator and denominator.
*
* 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.
+ * @param v_p The voltage numerator.
+ * @param v_q The voltage denominator.
*
* @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)
+SR_API char *sr_voltage_string(uint64_t v_p, uint64_t v_q)
{
- char *o;
int r;
+ char *o;
if (!(o = g_try_malloc0(30 + 1))) {
sr_err("%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);
+ if (v_q == 1000)
+ r = snprintf(o, 30, "%" PRIu64 "mV", v_p);
+ else if (v_q == 1)
+ r = snprintf(o, 30, "%" PRIu64 "V", v_p);
else
- r = -1;
+ r = snprintf(o, 30, "%gV", (float)v_p / (float)v_q);
if (r < 0) {
/* Something went wrong... */
const char *triggerstring)
{
GSList *l;
+ GVariant *gvar;
struct sr_probe *probe;
int max_probes, probenum, i;
char **tokens, **triggerlist, *trigger, *tc;
return NULL;
}
- if (sdi->driver->info_get(SR_DI_TRIGGER_TYPES,
- (const void **)&trigger_types, sdi) != SR_OK) {
+ 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++) {
}
}
g_strfreev(tokens);
+ g_variant_unref(gvar);
if (error) {
for (i = 0; i < max_probes; i++)
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;
}
-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;
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;