cli: fix driver option conversion

[sigrok-cli.git] / sigrok-cli.c

diff --git a/sigrok-cli.c b/sigrok-cli.c
index ccfc5e0cfcd548b872fe58cf025a28dd571a2b89..1b967814508ed76d906a9474faecd75e84df9ae1 100644 (file)
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -132,7 +132,6 @@ static GSList *hash_to_hwopt(GHashTable *hash)
                value = g_hash_table_lookup(hash, key);
                hwopt->value = g_strdup(value);
                opts = g_slist_append(opts, hwopt);
-               break;
        }
        g_list_free(keys);
 
@@ -1267,7 +1266,7 @@ static int set_dev_options(struct sr_dev_inst *sdi, GHashTable *args)
                        ret = SR_ERR;
                }
                if (val)
-                       ret = sdi->driver->dev_config_set(sdi, hwo->hwcap, val);
+                       ret = sr_dev_config_set(sdi, hwo->hwcap, val);
                if (ret != SR_OK) {
                        g_critical("Failed to set device option '%s'.", (char *)key);
                        return ret;
@@ -1292,8 +1291,7 @@ static int set_limit_time(const struct sr_dev_inst *sdi)
        }
 
        if (sr_driver_hwcap_exists(sdi->driver, SR_HWCAP_LIMIT_MSEC)) {
-               if (sdi->driver->dev_config_set(sdi,
-                       SR_HWCAP_LIMIT_MSEC, &time_msec) != SR_OK) {
+               if (sr_dev_config_set(sdi, SR_HWCAP_LIMIT_MSEC, &time_msec) != SR_OK) {
                        g_critical("Failed to configure time limit.");
                        sr_session_destroy();
                        return SR_ERR;
@@ -1315,8 +1313,8 @@ static int set_limit_time(const struct sr_dev_inst *sdi)
                        return SR_ERR;
                }
 
-               if (sdi->driver->dev_config_set(sdi,
-                       SR_HWCAP_LIMIT_SAMPLES, &limit_samples) != SR_OK) {
+               if (sr_dev_config_set(sdi, SR_HWCAP_LIMIT_SAMPLES,
+                                       &limit_samples) != SR_OK) {
                        g_critical("Failed to configure time-based sample limit.");
                        sr_session_destroy();
                        return SR_ERR;
@@ -1383,13 +1381,6 @@ static void run_session(void)
                g_free(triggerlist);
        }
 
-       if (sdi->driver->dev_config_set(sdi, SR_HWCAP_PROBECONFIG,
-                       (char *)sdi->probes) != SR_OK) {
-               g_critical("Failed to configure probes.");
-               sr_session_destroy();
-               return;
-       }
-
        if (opt_continuous) {
                if (!sr_driver_hwcap_exists(sdi->driver, SR_HWCAP_CONTINUOUS)) {
                        g_critical("This device does not support continuous sampling.");
@@ -1407,7 +1398,7 @@ static void run_session(void)
 
        if (opt_samples) {
                if ((sr_parse_sizestring(opt_samples, &limit_samples) != SR_OK)
-                               || (sdi->driver->dev_config_set(sdi, SR_HWCAP_LIMIT_SAMPLES,
+                               || (sr_dev_config_set(sdi, SR_HWCAP_LIMIT_SAMPLES,
                                                &limit_samples) != SR_OK)) {
                        g_critical("Failed to configure sample limit.");
                        sr_session_destroy();
@@ -1417,8 +1408,8 @@ static void run_session(void)
 
        if (opt_frames) {
                if ((sr_parse_sizestring(opt_frames, &limit_frames) != SR_OK)
-                               || (sdi->driver->dev_config_set(sdi,
-                           SR_HWCAP_LIMIT_FRAMES, &limit_frames) != SR_OK)) {
+                               || (sr_dev_config_set(sdi, SR_HWCAP_LIMIT_FRAMES,
+                                               &limit_frames) != SR_OK)) {
                        g_critical("Failed to configure frame limit.");
                        sr_session_destroy();
                        return;
@@ -1514,10 +1505,10 @@ int main(int argc, char **argv)
                show_version();
        else if (opt_list_devs)
                show_dev_list();
+       else if (opt_pds && opt_show)
+               show_pd_detail();
        else if (opt_show)
                show_dev_detail();
-       else if (opt_pds)
-               show_pd_detail();
        else if (opt_input_file)
                load_input_file();
        else if (opt_samples || opt_time || opt_frames || opt_continuous)