X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=parsers.c;h=5ec655f78ad3dce8a05f01186a2a7ec61febb437;hb=0bdb08fd3d1b0b410cb1d33b90f531c35008bd4d;hp=43b61b698cef21912f44707cdcf1c49fb65aa1f1;hpb=7b30c426552e9baf9998df61447adec91a17cb9d;p=sigrok-cli.git
diff --git a/parsers.c b/parsers.c
index 43b61b6..5ec655f 100644
--- a/parsers.c
+++ b/parsers.c
@@ -17,78 +17,83 @@
* along with this program. If not, see .
*/
-#include "sigrok-cli.h"
+#include
#include
#include
#include
#include
#include
+#include "sigrok-cli.h"
-static struct sr_probe *find_probe(GSList *probelist, const char *probename)
+struct sr_channel *find_channel(GSList *channellist, const char *channelname)
{
- struct sr_probe *probe;
+ struct sr_channel *ch;
GSList *l;
- probe = NULL;
- for (l = probelist; l; l = l->next) {
- probe = l->data;
- if (!strcmp(probe->name, probename))
+ ch = NULL;
+ for (l = channellist; l; l = l->next) {
+ ch = l->data;
+ if (!strcmp(ch->name, channelname))
break;
}
- probe = l ? l->data : NULL;
+ ch = l ? l->data : NULL;
- return probe;
+ return ch;
}
-GSList *parse_probestring(struct sr_dev_inst *sdi, const char *probestring)
+GSList *parse_channelstring(struct sr_dev_inst *sdi, const char *channelstring)
{
- struct sr_probe *probe;
- GSList *probelist;
+ struct sr_channel *ch;
+ GSList *channellist, *channels;
int ret, n, b, e, i;
char **tokens, **range, **names, *eptr, str[8];
- if (!probestring || !probestring[0])
- /* Use all probes by default. */
- return g_slist_copy(sdi->probes);
+ channels = sr_dev_inst_channels_get(sdi);
+
+ if (!channelstring || !channelstring[0])
+ /* Use all channels by default. */
+ return g_slist_copy(channels);
ret = SR_OK;
range = NULL;
names = NULL;
- probelist = NULL;
- tokens = g_strsplit(probestring, ",", 0);
+ channellist = NULL;
+ tokens = g_strsplit(channelstring, ",", 0);
for (i = 0; tokens[i]; i++) {
if (tokens[i][0] == '\0') {
- g_critical("Invalid empty probe.");
+ g_critical("Invalid empty channel.");
ret = SR_ERR;
break;
}
if (strchr(tokens[i], '-')) {
- /* A range of probes in the form a-b. This will only work
- * if the probes are named as numbers -- so every probe
- * in the range must exist as a probe name string in the
- * device. */
+ /*
+ * A range of channels in the form a-b. This will only work
+ * if the channels are named as numbers -- so every channel
+ * in the range must exist as a channel name string in the
+ * device.
+ */
range = g_strsplit(tokens[i], "-", 2);
if (!range[0] || !range[1] || range[2]) {
/* Need exactly two arguments. */
- g_critical("Invalid probe syntax '%s'.", tokens[i]);
+ g_critical("Invalid channel syntax '%s'.", tokens[i]);
ret = SR_ERR;
goto range_fail;
}
b = strtol(range[0], &eptr, 10);
if (eptr == range[0] || *eptr != '\0') {
- g_critical("Invalid probe '%s'.", range[0]);
+ g_critical("Invalid channel '%s'.", range[0]);
ret = SR_ERR;
goto range_fail;
}
e = strtol(range[1], NULL, 10);
if (eptr == range[1] || *eptr != '\0') {
- g_critical("Invalid probe '%s'.", range[1]);
+ g_critical("Invalid channel '%s'.", range[1]);
ret = SR_ERR;
goto range_fail;
}
if (b < 0 || b >= e) {
- g_critical("Invalid probe range '%s'.", tokens[i]);
+ g_critical("Invalid channel range '%s'.", tokens[i]);
ret = SR_ERR;
goto range_fail;
}
@@ -96,17 +101,17 @@ GSList *parse_probestring(struct sr_dev_inst *sdi, const char *probestring)
while (b <= e) {
n = snprintf(str, 8, "%d", b);
if (n < 0 || n > 8) {
- g_critical("Invalid probe '%d'.", b);
+ g_critical("Invalid channel '%d'.", b);
ret = SR_ERR;
break;
}
- probe = find_probe(sdi->probes, str);
- if (!probe) {
- g_critical("unknown probe '%d'.", b);
+ ch = find_channel(channels, str);
+ if (!ch) {
+ g_critical("unknown channel '%d'.", b);
ret = SR_ERR;
break;
}
- probelist = g_slist_append(probelist, probe);
+ channellist = g_slist_append(channellist, ch);
b++;
}
range_fail:
@@ -119,38 +124,147 @@ range_fail:
names = g_strsplit(tokens[i], "=", 2);
if (!names[0] || (names[1] && names[2])) {
/* Need one or two arguments. */
- g_critical("Invalid probe '%s'.", tokens[i]);
+ g_critical("Invalid channel '%s'.", tokens[i]);
g_strfreev(names);
ret = SR_ERR;
break;
}
- probe = find_probe(sdi->probes, names[0]);
- if (!probe) {
- g_critical("unknown probe '%s'.", names[0]);
+ ch = find_channel(channels, names[0]);
+ if (!ch) {
+ g_critical("unknown channel '%s'.", names[0]);
g_strfreev(names);
ret = SR_ERR;
break;
}
if (names[1]) {
- /* Rename probe. */
- g_free(probe->name);
- probe->name = g_strdup(names[1]);
+ /* Rename channel. */
+ g_free(ch->name);
+ ch->name = g_strdup(names[1]);
}
- probelist = g_slist_append(probelist, probe);
+ channellist = g_slist_append(channellist, ch);
g_strfreev(names);
}
}
if (ret != SR_OK) {
- g_slist_free(probelist);
- probelist = NULL;
+ g_slist_free(channellist);
+ channellist = NULL;
+ }
+
+ g_strfreev(tokens);
+
+ return channellist;
+}
+
+int parse_trigger_match(char c)
+{
+ int match;
+
+ if (c == '0')
+ match = SR_TRIGGER_ZERO;
+ else if (c == '1')
+ match = SR_TRIGGER_ONE;
+ else if (c == 'r')
+ match = SR_TRIGGER_RISING;
+ else if (c == 'f')
+ match = SR_TRIGGER_FALLING;
+ else if (c == 'e')
+ match = SR_TRIGGER_EDGE;
+ else if (c == 'o')
+ match = SR_TRIGGER_OVER;
+ else if (c == 'u')
+ match = SR_TRIGGER_UNDER;
+ else
+ match = 0;
+
+ return match;
+}
+
+int parse_triggerstring(const struct sr_dev_inst *sdi, const char *s,
+ struct sr_trigger **trigger)
+{
+ struct sr_channel *ch;
+ struct sr_trigger_stage *stage;
+ GVariant *gvar;
+ GSList *l, *channels;
+ gsize num_matches;
+ gboolean found_match, error;
+ const int32_t *matches;
+ int32_t match;
+ unsigned int j;
+ int t, i;
+ char **tokens, *sep;
+ struct sr_dev_driver *driver;
+
+ driver = sr_dev_inst_driver_get(sdi);
+ channels = sr_dev_inst_channels_get(sdi);
+
+ if (maybe_config_list(driver, sdi, NULL, SR_CONF_TRIGGER_MATCH,
+ &gvar) != SR_OK) {
+ g_critical("Device doesn't support any triggers.");
+ return FALSE;
}
+ matches = g_variant_get_fixed_array(gvar, &num_matches, sizeof(int32_t));
+ *trigger = sr_trigger_new(NULL);
+ error = FALSE;
+ tokens = g_strsplit(s, ",", -1);
+ for (i = 0; tokens[i]; i++) {
+ if (!(sep = strchr(tokens[i], '='))) {
+ g_critical("Invalid trigger '%s'.", tokens[i]);
+ error = TRUE;
+ break;
+ }
+ *sep++ = 0;
+ ch = NULL;
+ for (l = channels; l; l = l->next) {
+ ch = l->data;
+ if (ch->enabled && !strcmp(ch->name, tokens[i]))
+ break;
+ ch = NULL;
+ }
+ if (!ch) {
+ g_critical("Invalid channel '%s'.", tokens[i]);
+ error = TRUE;
+ break;
+ }
+ for (t = 0; sep[t]; t++) {
+ if (!(match = parse_trigger_match(sep[t]))) {
+ g_critical("Invalid trigger match '%c'.", sep[t]);
+ error = TRUE;
+ break;
+ }
+ found_match = FALSE;
+ for (j = 0; j < num_matches; j++) {
+ if (matches[j] == match) {
+ found_match = TRUE;
+ break;
+ }
+ }
+ if (!found_match) {
+ g_critical("Trigger match '%c' not supported by device.", sep[t]);
+ error = TRUE;
+ break;
+ }
+ /* Make sure this ends up in the right stage, creating
+ * them as needed. */
+ while (!(stage = g_slist_nth_data((*trigger)->stages, t)))
+ sr_trigger_stage_add(*trigger);
+ if (sr_trigger_match_add(stage, ch, match, 0) != SR_OK) {
+ error = TRUE;
+ break;
+ }
+ }
+ }
g_strfreev(tokens);
+ g_variant_unref(gvar);
+
+ if (error)
+ sr_trigger_free(*trigger);
- return probelist;
+ return !error;
}
GHashTable *parse_generic_arg(const char *arg, gboolean sep_first)
@@ -183,6 +297,58 @@ GHashTable *parse_generic_arg(const char *arg, gboolean sep_first)
return hash;
}
+GHashTable *generic_arg_to_opt(const struct sr_option **opts, GHashTable *genargs)
+{
+ GHashTable *hash;
+ GVariant *gvar;
+ int i;
+ char *s;
+ gboolean b;
+
+ hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
+ (GDestroyNotify)g_variant_unref);
+ for (i = 0; opts[i]; i++) {
+ if (!(s = g_hash_table_lookup(genargs, opts[i]->id)))
+ continue;
+ if (g_variant_is_of_type(opts[i]->def, G_VARIANT_TYPE_UINT32)) {
+ gvar = g_variant_new_uint32(strtoul(s, NULL, 10));
+ g_hash_table_insert(hash, g_strdup(opts[i]->id),
+ g_variant_ref_sink(gvar));
+ } else if (g_variant_is_of_type(opts[i]->def, G_VARIANT_TYPE_INT32)) {
+ gvar = g_variant_new_int32(strtoul(s, NULL, 10));
+ g_hash_table_insert(hash, g_strdup(opts[i]->id),
+ g_variant_ref_sink(gvar));
+ } else if (g_variant_is_of_type(opts[i]->def, G_VARIANT_TYPE_UINT64)) {
+ gvar = g_variant_new_uint64(strtoul(s, NULL, 10));
+ g_hash_table_insert(hash, g_strdup(opts[i]->id),
+ g_variant_ref_sink(gvar));
+ } else if (g_variant_is_of_type(opts[i]->def, G_VARIANT_TYPE_DOUBLE)) {
+ gvar = g_variant_new_double(strtod(s, NULL));
+ g_hash_table_insert(hash, g_strdup(opts[i]->id),
+ g_variant_ref_sink(gvar));
+ } else if (g_variant_is_of_type(opts[i]->def, G_VARIANT_TYPE_STRING)) {
+ gvar = g_variant_new_string(s);
+ g_hash_table_insert(hash, g_strdup(opts[i]->id),
+ g_variant_ref_sink(gvar));
+ } else if (g_variant_is_of_type(opts[i]->def, G_VARIANT_TYPE_BOOLEAN)) {
+ b = TRUE;
+ if (0 == strcmp(s, "false") || 0 == strcmp(s, "no")) {
+ b = FALSE;
+ } else if (!(0 == strcmp(s, "true") || 0 == strcmp(s, "yes"))) {
+ g_critical("Unable to convert '%s' to boolean!", s);
+ }
+
+ gvar = g_variant_new_boolean(b);
+ g_hash_table_insert(hash, g_strdup(opts[i]->id),
+ g_variant_ref_sink(gvar));
+ } else {
+ g_critical("Don't know GVariant type for option '%s'!", opts[i]->id);
+ }
+ }
+
+ return hash;
+}
+
static char *strcanon(const char *str)
{
int p0, p1;
@@ -213,3 +379,75 @@ int canon_cmp(const char *str1, const char *str2)
return ret;
}
+
+/* Convert driver options hash to GSList of struct sr_config. */
+static GSList *hash_to_hwopt(GHashTable *hash)
+{
+ struct sr_config *src;
+ GList *gl, *keys;
+ GSList *opts;
+ char *key;
+
+ keys = g_hash_table_get_keys(hash);
+ opts = NULL;
+ for (gl = keys; gl; gl = gl->next) {
+ key = gl->data;
+ src = g_malloc(sizeof(struct sr_config));
+ if (opt_to_gvar(key, g_hash_table_lookup(hash, key), src) != 0)
+ return NULL;
+ opts = g_slist_append(opts, src);
+ }
+ g_list_free(keys);
+
+ return opts;
+}
+
+int parse_driver(char *arg, struct sr_dev_driver **driver, GSList **drvopts)
+{
+ struct sr_dev_driver **drivers;
+ GHashTable *drvargs;
+ int i;
+ char *drvname;
+
+ if (!arg)
+ return FALSE;
+
+ drvargs = parse_generic_arg(arg, TRUE);
+
+ drvname = g_strdup(g_hash_table_lookup(drvargs, "sigrok_key"));
+ g_hash_table_remove(drvargs, "sigrok_key");
+ *driver = NULL;
+ drivers = sr_driver_list(sr_ctx);
+ for (i = 0; drivers[i]; i++) {
+ if (strcmp(drivers[i]->name, drvname))
+ continue;
+ *driver = drivers[i];
+ }
+ if (!*driver) {
+ g_critical("Driver %s not found.", drvname);
+ g_hash_table_destroy(drvargs);
+ g_free(drvname);
+ return FALSE;
+ }
+ g_free(drvname);
+ if (sr_driver_init(sr_ctx, *driver) != SR_OK) {
+ g_critical("Failed to initialize driver.");
+ g_hash_table_destroy(drvargs);
+ return FALSE;
+ }
+
+ if (drvopts) {
+ *drvopts = NULL;
+ if (g_hash_table_size(drvargs) > 0) {
+ if (!(*drvopts = hash_to_hwopt(drvargs))) {
+ /* Unknown options, already logged. */
+ g_hash_table_destroy(drvargs);
+ return FALSE;
+ }
+ }
+ }
+
+ g_hash_table_destroy(drvargs);
+
+ return TRUE;
+}