cli: output API says to check data_out, not length_out

[sigrok-cli.git] / sigrok-cli.c

diff --git a/sigrok-cli.c b/sigrok-cli.c
index 536ecced6a448cb3550d22804fbb89112f96e8a1..a67b6a3be61ed219309744fd48a9529bafb418cc 100644 (file)
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -204,11 +204,12 @@ static void show_dev_list(void)
 static void show_dev_detail(void)
 {
        struct sr_dev *dev;
-       struct sr_hwcap_option *hwo;
+       const struct sr_hwcap_option *hwo;
        const struct sr_samplerates *samplerates;
        struct sr_rational *rationals;
        uint64_t *integers;
-       int cap, *hwcaps, i;
+       const int *hwcaps;
+       int cap, i;
        char *s, *title;
        const char *charopts, **stropts;
 
@@ -332,6 +333,30 @@ static void show_dev_detail(void)
                        for (i = 0; stropts[i]; i++)
                                printf("      %s\n", stropts[i]);
 
+               } else if (hwo->hwcap == SR_HWCAP_VDIV) {
+                       /* Supported volts/div values */
+                       printf("    %s", hwo->shortname);
+                       if (sr_dev_info_get(dev, SR_DI_VDIVS,
+                                       (const void **)&rationals) != SR_OK) {
+                               printf("\n");
+                               continue;
+                       }
+                       printf(" - supported volts/div:\n");
+                       for (i = 0; rationals[i].p && rationals[i].q; i++)
+                               printf("      %s\n", sr_voltage_string( &rationals[i]));
+
+               } else if (hwo->hwcap == SR_HWCAP_COUPLING) {
+                       /* Supported coupling settings */
+                       printf("    %s", hwo->shortname);
+                       if (sr_dev_info_get(dev, SR_DI_COUPLING,
+                                       (const void **)&stropts) != SR_OK) {
+                               printf("\n");
+                               continue;
+                       }
+                       printf(" - supported coupling options:\n");
+                       for (i = 0; stropts[i]; i++)
+                               printf("      %s\n", stropts[i]);
+
                } else {
                        /* Everything else */
                        printf("    %s\n", hwo->shortname);
@@ -448,7 +473,7 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet)
                }
                if (o->format->event) {
                        o->format->event(o, SR_DF_END, &output_buf, &output_len);
-                       if (output_len) {
+                       if (output_buf) {
                                if (outfile)
                                        fwrite(output_buf, 1, output_len, outfile);
                                g_free(output_buf);
@@ -557,7 +582,7 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet)
                        output_len = 0;
                        if (o->format->data && packet->type == o->format->df_type)
                                o->format->data(o, filter_out, filter_out_len, &output_buf, &output_len);
-                       if (output_len) {
+                       if (output_buf) {
                                fwrite(output_buf, 1, output_len, outfile);
                                g_free(output_buf);
                        }
@@ -720,7 +745,7 @@ int setup_pd_stack(void)
 {
        struct srd_decoder_inst *di_from, *di_to;
        int ret, i;
-       char **pds;
+       char **pds, **ids;
 
        /* Set up the protocol decoder stack. */
        pds = g_strsplit(opt_pds, ",", 0);
@@ -736,17 +761,26 @@ int setup_pd_stack(void)
                        }
                }
 
-               if (!(di_from = srd_inst_find_by_id(pds[0]))) {
+               /* First PD goes at the bottom of the stack. */
+               ids = g_strsplit(pds[0], ":", 0);
+               if (!(di_from = srd_inst_find_by_id(ids[0]))) {
+                       g_strfreev(ids);
                        g_critical("Cannot stack protocol decoder '%s': "
                                        "instance not found.", pds[0]);
                        return 1;
                }
+               g_strfreev(ids);
+
+               /* Every subsequent PD goes on top. */
                for (i = 1; pds[i]; i++) {
-                       if (!(di_to = srd_inst_find_by_id(pds[i]))) {
+                       ids = g_strsplit(pds[i], ":", 0);
+                       if (!(di_to = srd_inst_find_by_id(ids[0]))) {
+                               g_strfreev(ids);
                                g_critical("Cannot stack protocol decoder '%s': "
                                                "instance not found.", pds[i]);
                                return 1;
                        }
+                       g_strfreev(ids);
                        if ((ret = srd_inst_stack(di_from, di_to)) != SRD_OK)
                                return 1;
 
@@ -1110,12 +1144,18 @@ static int set_dev_options(struct sr_dev *dev, GHashTable *args)
                                ret = dev->driver->dev_config_set(dev->driver_index,
                                                sr_hwcap_options[i].hwcap, &tmp_float);
                                break;
-                       case SR_T_RATIONAL:
+                       case SR_T_RATIONAL_PERIOD:
                                if ((ret = sr_parse_period(value, &tmp_rat)) != SR_OK)
                                        break;
                                ret = dev->driver->dev_config_set(dev->driver_index,
                                                sr_hwcap_options[i].hwcap, &tmp_rat);
                                break;
+                       case SR_T_RATIONAL_VOLT:
+                               if ((ret = sr_parse_voltage(value, &tmp_rat)) != SR_OK)
+                                       break;
+                               ret = dev->driver->dev_config_set(dev->driver_index,
+                                               sr_hwcap_options[i].hwcap, &tmp_rat);
+                               break;
                        default:
                                ret = SR_ERR;
                        }