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 6957c9d12b95c5e29ce97cc2ef643b1d850e66c4..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,19 +746,19 @@ 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->set_configuration(dev->plugin_index,
-                                               sr_hwcap_options[i].hwcap, &tmp_u64);
+                               ret = dev->plugin->dev_config_set(dev->plugin_index,
+                                       sr_hwcap_options[i].hwcap, &tmp_u64);
                                break;
                        case SR_T_CHAR:
-                               ret = dev->plugin->set_configuration(dev->plugin_index,
-                                               sr_hwcap_options[i].hwcap, value);
+                               ret = dev->plugin->dev_config_set(dev->plugin_index,
+                                       sr_hwcap_options[i].hwcap, value);
                                break;
                        case SR_T_BOOL:
                                if (!value)
                                        tmp_bool = TRUE;
                                else 
                                        tmp_bool = sr_parse_boolstring(value);
-                               ret = dev->plugin->set_configuration(dev->plugin_index,
+                               ret = dev->plugin->dev_config_set(dev->plugin_index,
                                                sr_hwcap_options[i].hwcap, 
                                                GINT_TO_POINTER(tmp_bool));
                                break;
@@ -870,8 +869,8 @@ static void run_session(void)
                }
 
                if (sr_hw_has_hwcap(dev->plugin, SR_HWCAP_LIMIT_MSEC)) {
-                       if (dev->plugin->set_configuration(dev->plugin_index,
-                                                         SR_HWCAP_LIMIT_MSEC, &time_msec) != SR_OK) {
+                       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();
                                return;
@@ -895,8 +894,8 @@ static void run_session(void)
                                return;
                        }
 
-                       if (dev->plugin->set_configuration(dev->plugin_index,
-                                                 SR_HWCAP_LIMIT_SAMPLES, &limit_samples) != SR_OK) {
+                       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();
                                return;
@@ -906,15 +905,15 @@ static void run_session(void)
 
        if (opt_samples) {
                if ((sr_parse_sizestring(opt_samples, &limit_samples) != SR_OK)
-                       || (dev->plugin->set_configuration(dev->plugin_index,
-                                       SR_HWCAP_LIMIT_SAMPLES, &limit_samples) != SR_OK)) {
+                       || (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();
                        return;
                }
        }
 
-       if (dev->plugin->set_configuration(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();