X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=sigrok-cli.c;h=6feabd4df3838e281dda077a76007537f2976a7f;hp=0713b51ccda63247d9639ba7314e2ccb3f69062d;hb=1cf6a109935a29127f6df954da2defdc73bdedaf;hpb=2777cbd2d252c1ef23e112e1771052a41aa588eb diff --git a/sigrok-cli.c b/sigrok-cli.c index 0713b51..6feabd4 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) { @@ -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; @@ -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;