X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=sigrok-cli.c;h=e58c51422a817ac37c8e0171c570caaa2bdbfeb2;hp=a6db4f5ddc3cba15e47d933dd2964aa10c073497;hb=2d73284ebd14c28579076312987694cbd35cfe42;hpb=41d7fb2343dc765fa34ffa661ee19c20c93eff9a diff --git a/sigrok-cli.c b/sigrok-cli.c index a6db4f5..e58c514 100644 --- a/sigrok-cli.c +++ b/sigrok-cli.c @@ -66,6 +66,7 @@ static gchar *opt_time = NULL; static gchar *opt_samples = NULL; static gchar *opt_frames = NULL; static gchar *opt_continuous = NULL; +static gchar *opt_set = NULL; static GOptionEntry optargs[] = { {"version", 'V', 0, G_OPTION_ARG_NONE, &opt_version, @@ -108,6 +109,7 @@ static GOptionEntry optargs[] = { "Number of frames to acquire", NULL}, {"continuous", 0, 0, G_OPTION_ARG_NONE, &opt_continuous, "Sample continuously", NULL}, + {"set", 0, 0, G_OPTION_ARG_NONE, &opt_set, "Set device options only", NULL}, {NULL, 0, 0, 0, NULL, NULL, NULL} }; @@ -1292,6 +1294,40 @@ static int set_dev_options(struct sr_dev_inst *sdi, GHashTable *args) return SR_OK; } +static void set_options(void) +{ + struct sr_dev_inst *sdi; + GSList *devices; + GHashTable *devargs; + + if (!opt_dev) { + g_critical("No setting specified."); + return; + } + + if (!(devargs = parse_generic_arg(opt_dev, FALSE))) + return; + + if (!(devices = device_scan())) { + g_critical("No devices found."); + return; + } + sdi = devices->data; + + sr_session_new(); + if (sr_session_dev_add(sdi) != SR_OK) { + g_critical("Failed to use device."); + return; + } + + set_dev_options(sdi, devargs); + + sr_session_destroy(); + g_slist_free(devices); + g_hash_table_destroy(devargs); + +} + static int set_limit_time(const struct sr_dev_inst *sdi) { uint64_t time_msec; @@ -1521,6 +1557,8 @@ int main(int argc, char **argv) show_dev_detail(); else if (opt_input_file) load_input_file(); + else if (opt_set) + set_options(); else if (opt_samples || opt_time || opt_frames || opt_continuous) run_session(); else