X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=show.c;h=aec61f142d7aff4a90a38e32a4b80ad56fb45f2d;hp=d43c716ba52d4bde79af35b89af38d885a7c7268;hb=ee639fb40fa43aa3553ef0229def9bcdb8338c2b;hpb=15db66c6a90ea967264b66b80d381b89847e3afa
diff --git a/show.c b/show.c
index d43c716..aec61f1 100644
--- a/show.c
+++ b/show.c
@@ -17,9 +17,9 @@
* along with this program. If not, see .
*/
-#include "sigrok-cli.h"
#include
#include
+#include "sigrok-cli.h"
static gint sort_inputs(gconstpointer a, gconstpointer b)
{
@@ -78,7 +78,7 @@ void show_version(void)
#endif
printf("Supported hardware drivers:\n");
- drivers = sr_driver_list();
+ drivers = sr_driver_list(sr_ctx);
for (sl = NULL, i = 0; drivers[i]; i++)
sl = g_slist_append(sl, drivers[i]);
sl = g_slist_sort(sl, sort_drivers);
@@ -308,8 +308,10 @@ void show_dev_detail(void)
return;
}
- /* Selected channels and channel group may affect which options are
- * returned, or which values for them. */
+ /*
+ * Selected channels and channel group may affect which options are
+ * returned, or which values for them.
+ */
select_channels(sdi);
channel_group = select_channel_group(sdi);
@@ -356,7 +358,7 @@ void show_dev_detail(void)
&num_elements, sizeof(int32_t));
printf(" Supported triggers: ");
for (i = 0; i < num_elements; i++) {
- switch(int32[i]) {
+ switch (int32[i]) {
case SR_TRIGGER_ZERO:
c = '0';
break;
@@ -390,12 +392,14 @@ void show_dev_detail(void)
} else if (key == SR_CONF_LIMIT_SAMPLES
&& config_key_has_cap(driver, sdi, NULL, key, SR_CONF_LIST)) {
- /* If implemented in config_list(), this denotes the
+ /*
+ * If implemented in config_list(), this denotes the
* maximum number of samples a device can send. This
* really applies only to logic analyzers, and then
* only to those that don't support compression, or
* have it turned off by default. The values returned
- * are the low/high limits. */
+ * are the low/high limits.
+ */
if (sr_config_list(driver, sdi, channel_group, key,
&gvar) == SR_OK) {
g_variant_get(gvar, "(tt)", &low, &high);