cli: use output API for analog and frame begin/end packets

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

diff --git a/sigrok-cli.c b/sigrok-cli.c
index a9f15285e8faa64028904924fb8da6176801bc7d..3bda15857377cb9f4c7546a08001eb9f6d797eec 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;
 
@@ -435,10 +436,9 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet)
        struct sr_datafeed_analog *analog;
        struct sr_datafeed_meta_analog *meta_analog;
        static int num_enabled_analog_probes = 0;
-       int num_enabled_probes, sample_size, data_offset, ret, i, j;
+       int num_enabled_probes, sample_size, ret, i;
        uint64_t output_len, filter_out_len;
        uint8_t *output_buf, *filter_out;
-       float asample;
 
        /* If the first packet to come in isn't a header, don't even try. */
        if (packet->type != SR_DF_HEADER && o == NULL)
@@ -472,7 +472,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);
@@ -581,7 +581,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);
                        }
@@ -621,9 +621,6 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet)
                                outfile = g_fopen(opt_output_file, "wb");
                        }
                }
-//             if (opt_pds)
-//                     srd_session_start(num_enabled_probes, unitsize,
-//                                     meta_logic->samplerate);
                break;
 
        case SR_DF_ANALOG:
@@ -635,33 +632,41 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet)
                if (limit_samples && received_samples >= limit_samples)
                        break;
 
-               data_offset = 0;
-               for (i = 0; i < analog->num_samples; i++) {
-                       for (j = 0; j < num_enabled_analog_probes; j++) {
-                               asample = analog->data[data_offset++];
-                               printf("%s: %f\n", analog_probelist[j]->name, asample);
+               if (o->format->data && packet->type == o->format->df_type) {
+                       o->format->data(o, (const uint8_t *)analog->data,
+                                       analog->num_samples * sizeof(float),
+                                       &output_buf, &output_len);
+                       if (output_buf) {
+                               fwrite(output_buf, 1, output_len, outfile);
+                               g_free(output_buf);
                        }
-//                     asample1 = asample2 = 0.0;
-//                     asample1 = analog->data[data_offset++];
-//                     asample2 = analog->data[i * num_analog_probes + 1];
-//                     printf("%d\t%f\t%f\n", received_samples+i+1, asample1, asample2);
                }
 
-//             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);
-
                received_samples += analog->num_samples;
                break;
 
        case SR_DF_FRAME_BEGIN:
-               /* TODO */
-               printf("BEGIN\n");
+               g_debug("cli: received SR_DF_FRAME_BEGIN");
+               if (o->format->event) {
+                       o->format->event(o, SR_DF_FRAME_BEGIN, &output_buf,
+                                        &output_len);
+                       if (output_buf) {
+                               fwrite(output_buf, 1, output_len, outfile);
+                               g_free(output_buf);
+                       }
+               }
                break;
 
        case SR_DF_FRAME_END:
-               /* TODO */
-               printf("END\n");
+               g_debug("cli: received SR_DF_FRAME_END");
+               if (o->format->event) {
+                       o->format->event(o, SR_DF_FRAME_END, &output_buf,
+                                        &output_len);
+                       if (output_buf) {
+                               fwrite(output_buf, 1, output_len, outfile);
+                               g_free(output_buf);
+                       }
+               }
                break;
 
        default:
@@ -744,7 +749,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);
@@ -760,17 +765,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;
 
@@ -850,6 +864,7 @@ int setup_output_format(void)
                 */
                default_output_format = TRUE;
        }
+
        fmtargs = parse_generic_arg(opt_output_format);
        fmtspec = g_hash_table_lookup(fmtargs, "sigrok_key");
        if (!fmtspec) {