X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=sigrok-cli.c;h=981d6efeb92e790e53a553209a736cc9abf33fdd;hp=e95ec9ebbc687a1e120961748c1c77d212e770f0;hb=894e20532ebaf07e22259d5bcec1b44239855698;hpb=f082186b9b295b21f5ca07132999d8657f6ab2c6

diff --git a/sigrok-cli.c b/sigrok-cli.c
index e95ec9e..981d6ef 100644
--- 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;
@@ -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;
@@ -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;