X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=parsers.c;h=5ec655f78ad3dce8a05f01186a2a7ec61febb437;hb=f4599c1a3530a02182a818108d1131cfd3ef984e;hp=c2a7c2602f189e814588f0b85d761107d591cfc3;hpb=87e24fedeb35cb7d5b1c593150ac1a92cf10cf4d;p=sigrok-cli.git
diff --git a/parsers.c b/parsers.c
index c2a7c26..5ec655f 100644
--- a/parsers.c
+++ b/parsers.c
@@ -17,12 +17,13 @@
* along with this program. If not, see .
*/
-#include "sigrok-cli.h"
+#include
#include
#include
#include
#include
#include
+#include "sigrok-cli.h"
struct sr_channel *find_channel(GSList *channellist, const char *channelname)
{
@@ -43,13 +44,15 @@ struct sr_channel *find_channel(GSList *channellist, const char *channelname)
GSList *parse_channelstring(struct sr_dev_inst *sdi, const char *channelstring)
{
struct sr_channel *ch;
- GSList *channellist;
+ GSList *channellist, *channels;
int ret, n, b, e, i;
char **tokens, **range, **names, *eptr, str[8];
+ channels = sr_dev_inst_channels_get(sdi);
+
if (!channelstring || !channelstring[0])
/* Use all channels by default. */
- return g_slist_copy(sdi->channels);
+ return g_slist_copy(channels);
ret = SR_OK;
range = NULL;
@@ -63,10 +66,12 @@ GSList *parse_channelstring(struct sr_dev_inst *sdi, const char *channelstring)
break;
}
if (strchr(tokens[i], '-')) {
- /* A range of channels in the form a-b. This will only work
+ /*
+ * 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. */
+ * device.
+ */
range = g_strsplit(tokens[i], "-", 2);
if (!range[0] || !range[1] || range[2]) {
/* Need exactly two arguments. */
@@ -100,7 +105,7 @@ GSList *parse_channelstring(struct sr_dev_inst *sdi, const char *channelstring)
ret = SR_ERR;
break;
}
- ch = find_channel(sdi->channels, str);
+ ch = find_channel(channels, str);
if (!ch) {
g_critical("unknown channel '%d'.", b);
ret = SR_ERR;
@@ -125,7 +130,7 @@ range_fail:
break;
}
- ch = find_channel(sdi->channels, names[0]);
+ ch = find_channel(channels, names[0]);
if (!ch) {
g_critical("unknown channel '%s'.", names[0]);
g_strfreev(names);
@@ -183,7 +188,7 @@ int parse_triggerstring(const struct sr_dev_inst *sdi, const char *s,
struct sr_channel *ch;
struct sr_trigger_stage *stage;
GVariant *gvar;
- GSList *l;
+ GSList *l, *channels;
gsize num_matches;
gboolean found_match, error;
const int32_t *matches;
@@ -191,8 +196,12 @@ int parse_triggerstring(const struct sr_dev_inst *sdi, const char *s,
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 (sr_config_list(sdi->driver, sdi, NULL, SR_CONF_TRIGGER_MATCH,
+ if (maybe_config_list(driver, sdi, NULL, SR_CONF_TRIGGER_MATCH,
&gvar) != SR_OK) {
g_critical("Device doesn't support any triggers.");
return FALSE;
@@ -210,7 +219,7 @@ int parse_triggerstring(const struct sr_dev_inst *sdi, const char *s,
}
*sep++ = 0;
ch = NULL;
- for (l = sdi->channels; l; l = l->next) {
+ for (l = channels; l; l = l->next) {
ch = l->data;
if (ch->enabled && !strcmp(ch->name, tokens[i]))
break;
@@ -294,6 +303,7 @@ GHashTable *generic_arg_to_opt(const struct sr_option **opts, GHashTable *genarg
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);
@@ -308,6 +318,10 @@ GHashTable *generic_arg_to_opt(const struct sr_option **opts, GHashTable *genarg
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),
@@ -316,6 +330,17 @@ GHashTable *generic_arg_to_opt(const struct sr_option **opts, GHashTable *genarg
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);
}
@@ -354,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;
+}