Deprecate SR_DI_HWOPTS.

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

diff --git a/sigrok-cli.c b/sigrok-cli.c
index 18cd4a74039d138b2aa249ea3a0ae80e4e59a3cf..981d6efeb92e790e53a553209a736cc9abf33fdd 100644 (file)
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -332,7 +332,7 @@ static void show_dev_detail(void)
 
        print_dev_line(sdi);
 
-       if (sr_info_get(sdi->driver, SR_DI_TRIGGER_TYPES, (const void **)&charopts,
+       if (sr_config_list(sdi->driver, SR_CONF_TRIGGER_TYPE, (const void **)&charopts,
                        sdi) == SR_OK && charopts) {
                printf("Supported triggers: ");
                while (*charopts) {
@@ -342,7 +342,7 @@ static void show_dev_detail(void)
                printf("\n");
        }
 
-       if ((sr_info_get(sdi->driver, SR_DI_HWOPTS, (const void **)&hwopts,
+       if ((sr_config_list(sdi->driver, SR_CONF_SCAN_OPTIONS, (const void **)&hwopts,
                        NULL) == SR_OK) && hwopts) {
                printf("Supported driver options:\n");
                for (i = 0; hwopts[i]; i++) {
@@ -353,7 +353,7 @@ static void show_dev_detail(void)
        }
 
        title = "Supported device options:\n";
-       if ((sr_info_get(sdi->driver, SR_DI_HWCAPS, (const void **)&hwcaps,
+       if ((sr_config_list(sdi->driver, SR_CONF_DEVICE_OPTIONS, (const void **)&hwcaps,
                        NULL) != SR_OK) || !hwcaps)
                /* Driver supports no device instance options. */
                return;
@@ -424,7 +424,7 @@ static void show_dev_detail(void)
                } else if (srci->key == SR_CONF_TIMEBASE) {
                        /* Supported time bases */
                        printf("    %s", srci->id);
-                       if (sr_info_get(sdi->driver, SR_DI_TIMEBASES,
+                       if (sr_config_list(sdi->driver, SR_CONF_TIMEBASE,
                                        (const void **)&rationals, sdi) != SR_OK) {
                                printf("\n");
                                continue;
@@ -437,7 +437,7 @@ static void show_dev_detail(void)
                } else if (srci->key == SR_CONF_TRIGGER_SOURCE) {
                        /* Supported trigger sources */
                        printf("    %s", srci->id);
-                       if (sr_info_get(sdi->driver, SR_DI_TRIGGER_SOURCES,
+                       if (sr_config_list(sdi->driver, SR_CONF_TRIGGER_SOURCE,
                                        (const void **)&stropts, sdi) != SR_OK) {
                                printf("\n");
                                continue;