Deprecate SR_DI_HWCAPS.
[sigrok-cli.git] / sigrok-cli.c
index d3613106e4364d09cc15d503057c23cdc7f59d7a..6feabd4df3838e281dda077a76007537f2976a7f 100644 (file)
@@ -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) {
@@ -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;
@@ -370,7 +370,7 @@ static void show_dev_detail(void)
                if (srci->key == SR_CONF_PATTERN_MODE) {
                        /* Pattern generator modes */
                        printf("    %s", srci->id);
-                       if (sr_info_get(sdi->driver, SR_DI_PATTERNS,
+                       if (sr_config_list(sdi->driver, SR_CONF_PATTERN_MODE,
                                        (const void **)&stropts, sdi) == SR_OK) {
                                printf(" - supported patterns:\n");
                                for (i = 0; stropts[i]; i++)
@@ -382,7 +382,7 @@ static void show_dev_detail(void)
                } else if (srci->key == SR_CONF_SAMPLERATE) {
                        /* Supported samplerates */
                        printf("    %s", srci->id);
-                       if (sr_info_get(sdi->driver, SR_DI_SAMPLERATES,
+                       if (sr_config_list(sdi->driver, SR_CONF_SAMPLERATE,
                                        (const void **)&samplerates, sdi) != SR_OK) {
                                printf("\n");
                                continue;
@@ -412,7 +412,7 @@ static void show_dev_detail(void)
                } else if (srci->key == SR_CONF_BUFFERSIZE) {
                        /* Supported buffer sizes */
                        printf("    %s", srci->id);
-                       if (sr_info_get(sdi->driver, SR_DI_BUFFERSIZES,
+                       if (sr_config_list(sdi->driver, SR_CONF_BUFFERSIZE,
                                        (const void **)&integers, sdi) != SR_OK) {
                                printf("\n");
                                continue;
@@ -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;
@@ -449,7 +449,7 @@ static void show_dev_detail(void)
                } else if (srci->key == SR_CONF_FILTER) {
                        /* Supported filters */
                        printf("    %s", srci->id);
-                       if (sr_info_get(sdi->driver, SR_DI_FILTERS,
+                       if (sr_config_list(sdi->driver, SR_CONF_FILTER,
                                        (const void **)&stropts, sdi) != SR_OK) {
                                printf("\n");
                                continue;
@@ -461,7 +461,7 @@ static void show_dev_detail(void)
                } else if (srci->key == SR_CONF_VDIV) {
                        /* Supported volts/div values */
                        printf("    %s", srci->id);
-                       if (sr_info_get(sdi->driver, SR_DI_VDIVS,
+                       if (sr_config_list(sdi->driver, SR_CONF_VDIV,
                                        (const void **)&rationals, sdi) != SR_OK) {
                                printf("\n");
                                continue;
@@ -473,7 +473,7 @@ static void show_dev_detail(void)
                } else if (srci->key == SR_CONF_COUPLING) {
                        /* Supported coupling settings */
                        printf("    %s", srci->id);
-                       if (sr_info_get(sdi->driver, SR_DI_COUPLING,
+                       if (sr_config_list(sdi->driver, SR_CONF_COUPLING,
                                        (const void **)&stropts, sdi) != SR_OK) {
                                printf("\n");
                                continue;
@@ -629,7 +629,7 @@ static void datafeed_in(const struct sr_dev_inst *sdi,
                unitsize = (logic_probelist->len + 7) / 8;
 
                if (opt_pds && logic_probelist->len) {
-                       if (sr_info_get(sdi->driver, SR_DI_CUR_SAMPLERATE,
+                       if (sr_info_get(sdi->driver, SR_CONF_SAMPLERATE,
                                        (const void **)&samplerate, sdi) != SR_OK) {
                                g_critical("Unable to initialize protocol "
                                                "decoders: no samplerate found.");
@@ -1325,7 +1325,7 @@ static int set_limit_time(const struct sr_dev_inst *sdi)
                 */
                limit_samples = 0;
                if (sr_dev_has_hwcap(sdi, SR_CONF_SAMPLERATE)) {
-                       sr_info_get(sdi->driver, SR_DI_CUR_SAMPLERATE,
+                       sr_info_get(sdi->driver, SR_CONF_SAMPLERATE,
                                        (const void **)&samplerate, sdi);
                        limit_samples = (*samplerate) * time_msec / (uint64_t)1000;
                }