sr: No need for dynamic hardware driver registration.

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

diff --git a/sigrok-cli.c b/sigrok-cli.c
index de173b76587b3127d998c28787840d8a8118c8a8..1b34bf5c9701ccd772ce2b696cca02e207cc9fb2 100644 (file)
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -85,8 +85,8 @@ static GOptionEntry optargs[] = {
 
 static void show_version(void)
 {
-       GSList *plugins, *p, *l;
-       struct sr_dev_plugin *plugin;
+       GSList *l;
+       struct sr_dev_plugin **plugins;
        struct sr_input_format **inputs;
        struct sr_output_format **outputs;
        struct srd_decoder *dec;
@@ -96,9 +96,8 @@ static void show_version(void)
 
        printf("Supported hardware drivers:\n");
        plugins = sr_hw_list();
-       for (p = plugins; p; p = p->next) {
-               plugin = p->data;
-               printf("  %-20s %s\n", plugin->name, plugin->longname);
+       for (i = 0; plugins[i]; i++) {
+               printf("  %-20s %s\n", plugins[i]->name, plugins[i]->longname);
        }
        printf("\n");
 
@@ -747,11 +746,11 @@ static int set_dev_options(struct sr_dev *dev, GHashTable *args)
                                ret = sr_parse_sizestring(value, &tmp_u64);
                                if (ret != SR_OK)
                                        break;
-                               ret = dev->plugin->config_set(dev->plugin_index,
+                               ret = dev->plugin->dev_config_set(dev->plugin_index,
                                        sr_hwcap_options[i].hwcap, &tmp_u64);
                                break;
                        case SR_T_CHAR:
-                               ret = dev->plugin->config_set(dev->plugin_index,
+                               ret = dev->plugin->dev_config_set(dev->plugin_index,
                                        sr_hwcap_options[i].hwcap, value);
                                break;
                        case SR_T_BOOL:
@@ -759,7 +758,7 @@ static int set_dev_options(struct sr_dev *dev, GHashTable *args)
                                        tmp_bool = TRUE;
                                else 
                                        tmp_bool = sr_parse_boolstring(value);
-                               ret = dev->plugin->config_set(dev->plugin_index,
+                               ret = dev->plugin->dev_config_set(dev->plugin_index,
                                                sr_hwcap_options[i].hwcap, 
                                                GINT_TO_POINTER(tmp_bool));
                                break;
@@ -870,7 +869,7 @@ static void run_session(void)
                }
 
                if (sr_hw_has_hwcap(dev->plugin, SR_HWCAP_LIMIT_MSEC)) {
-                       if (dev->plugin->config_set(dev->plugin_index,
+                       if (dev->plugin->dev_config_set(dev->plugin_index,
                            SR_HWCAP_LIMIT_MSEC, &time_msec) != SR_OK) {
                                printf("Failed to configure time limit.\n");
                                sr_session_destroy();
@@ -895,7 +894,7 @@ static void run_session(void)
                                return;
                        }
 
-                       if (dev->plugin->config_set(dev->plugin_index,
+                       if (dev->plugin->dev_config_set(dev->plugin_index,
                            SR_HWCAP_LIMIT_SAMPLES, &limit_samples) != SR_OK) {
                                printf("Failed to configure time-based sample limit.\n");
                                sr_session_destroy();
@@ -906,7 +905,7 @@ static void run_session(void)
 
        if (opt_samples) {
                if ((sr_parse_sizestring(opt_samples, &limit_samples) != SR_OK)
-                       || (dev->plugin->config_set(dev->plugin_index,
+                       || (dev->plugin->dev_config_set(dev->plugin_index,
                            SR_HWCAP_LIMIT_SAMPLES, &limit_samples) != SR_OK)) {
                        printf("Failed to configure sample limit.\n");
                        sr_session_destroy();
@@ -914,7 +913,7 @@ static void run_session(void)
                }
        }
 
-       if (dev->plugin->config_set(dev->plugin_index,
+       if (dev->plugin->dev_config_set(dev->plugin_index,
                  SR_HWCAP_PROBECONFIG, (char *)dev->probes) != SR_OK) {
                printf("Failed to configure probes.\n");
                sr_session_destroy();