Use new sr_key_info instead of sr_config_info.

[sigrok-cli.git] / show.c

diff --git a/show.c b/show.c
index 88a272f3855c7636496c90f616ccc6d3efe1d7aa..e81110a5eb5ec9f8ebbeb7774dc4bae6d738b3ec 100644 (file)
--- a/show.c
+++ b/show.c
@@ -78,7 +78,7 @@ void show_version(void)
 #endif
 
        printf("Supported hardware drivers:\n");
-       drivers = sr_driver_list();
+       drivers = sr_driver_list(sr_ctx);
        for (sl = NULL, i = 0; drivers[i]; i++)
                sl = g_slist_append(sl, drivers[i]);
        sl = g_slist_sort(sl, sort_drivers);
@@ -223,7 +223,7 @@ void show_dev_list(void)
 
 void show_drv_detail(struct sr_dev_driver *driver)
 {
-       const struct sr_config_info *srci;
+       const struct sr_key_info *srci;
        GVariant *gvar_opts;
        const uint32_t *opts;
        gsize num_elements, i;
@@ -235,7 +235,7 @@ void show_drv_detail(struct sr_dev_driver *driver)
                if (num_elements) {
                        printf("Driver functions:\n");
                        for (i = 0; i < num_elements; i++) {
-                               if (!(srci = sr_config_info_get(opts[i] & SR_CONF_MASK)))
+                               if (!(srci = sr_key_info_get(SR_KEY_CONFIG, opts[i] & SR_CONF_MASK)))
                                        continue;
                                printf("    %s\n", srci->name);
                        }
@@ -250,7 +250,7 @@ void show_drv_detail(struct sr_dev_driver *driver)
                if (num_elements) {
                        printf("Scan options:\n");
                        for (i = 0; i < num_elements; i++) {
-                               if (!(srci = sr_config_info_get(opts[i] & SR_CONF_MASK)))
+                               if (!(srci = sr_key_info_get(SR_KEY_CONFIG, opts[i] & SR_CONF_MASK)))
                                        continue;
                                printf("    %s\n", srci->id);
                        }
@@ -345,7 +345,7 @@ void show_dev_detail(void)
        opts = g_variant_get_fixed_array(gvar_opts, &num_opts, sizeof(uint32_t));
        for (o = 0; o < num_opts; o++) {
                key = opts[o] & SR_CONF_MASK;
-               if (!(srci = sr_config_info_get(key)))
+               if (!(srci = sr_key_info_get(SR_KEY_CONFIG, key)))
                        continue;
 
                if (key == SR_CONF_TRIGGER_MATCH) {