Pass unitsize to srd_session_send() directly.

[sigrok-cli.git] / show.c

diff --git a/show.c b/show.c
index a5999a2b434d37a93c2f57de57a1f1f996aac5ea..aec61f142d7aff4a90a38e32a4b80ad56fb45f2d 100644 (file)
--- a/show.c
+++ b/show.c
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 

-#include "sigrok-cli.h"

 #include <glib.h>
 #include <string.h>
 #include <glib.h>
 #include <string.h>

+#include "sigrok-cli.h"

 
 static gint sort_inputs(gconstpointer a, gconstpointer b)
 {
 
 static gint sort_inputs(gconstpointer a, gconstpointer b)
 {


@@ -78,7 +78,7 @@ void show_version(void)
 #endif
 
        printf("Supported hardware drivers:\n");
 #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);
        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;
        }
 
                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);
 
        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++) {
                                        &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;
                                case SR_TRIGGER_ZERO:
                                        c = '0';
                                        break;


@@ -389,13 +391,15 @@ void show_dev_detail(void)
                        g_variant_unref(gvar_list);
 
                } else if (key == SR_CONF_LIMIT_SAMPLES
                        g_variant_unref(gvar_list);
 
                } else if (key == SR_CONF_LIMIT_SAMPLES

-                               && config_key_has_cap(driver, sdi, cg, key, SR_CONF_LIST)) {
-                       /* If implemented in config_list(), this denotes the
+                               && config_key_has_cap(driver, sdi, NULL, key, SR_CONF_LIST)) {
+                       /*
+                        * 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
                         * 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);
                        if (sr_config_list(driver, sdi, channel_group, key,
                                        &gvar) == SR_OK) {
                                g_variant_get(gvar, "(tt)", &low, &high);