X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=sigrok-cli.c;h=8428f63d026bc0926e95588b89f027cc2d4bc6be;hb=9b0b39f6312c2ebbee92bd97076cffe63116c05e;hp=a67970d10788b1246fdb3b7d6e8dd2e5b8feea1c;hpb=d2f671dce752792e12f1fbbf200e37db36d88c24;p=sigrok-cli.git

diff --git a/sigrok-cli.c b/sigrok-cli.c
index a67970d..8428f63 100644
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -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++)
@@ -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;
@@ -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;
 		}