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 fe38824e4c59526d7a3f5850404cfe8e2cc1804b..3bda15857377cb9f4c7546a08001eb9f6d797eec 100644 (file)
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -204,9 +204,12 @@ static void show_dev_list(void)
 static void show_dev_detail(void)
 {
        struct sr_dev *dev;
 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;
        const struct sr_samplerates *samplerates;

-       int cap, *hwcaps, i;
+       struct sr_rational *rationals;
+       uint64_t *integers;
+       const int *hwcaps;
+       int cap, i;

        char *s, *title;
        const char *charopts, **stropts;
 
        char *s, *title;
        const char *charopts, **stropts;
 


@@ -240,6 +243,7 @@ static void show_dev_detail(void)
                }
 
                if (hwo->hwcap == SR_HWCAP_PATTERN_MODE) {
                }
 
                if (hwo->hwcap == SR_HWCAP_PATTERN_MODE) {

+                       /* Pattern generator modes */

                        printf("    %s", hwo->shortname);
                        if (sr_dev_info_get(dev, SR_DI_PATTERNS,
                                        (const void **)&stropts) == SR_OK) {
                        printf("    %s", hwo->shortname);
                        if (sr_dev_info_get(dev, SR_DI_PATTERNS,
                                        (const void **)&stropts) == SR_OK) {


@@ -249,15 +253,15 @@ static void show_dev_detail(void)
                        } else {
                                printf("\n");
                        }
                        } else {
                                printf("\n");
                        }

+

                } else if (hwo->hwcap == SR_HWCAP_SAMPLERATE) {
                } else if (hwo->hwcap == SR_HWCAP_SAMPLERATE) {

-                       printf("    %s", hwo->shortname);

                        /* Supported samplerates */
                        /* Supported samplerates */

+                       printf("    %s", hwo->shortname);

                        if (sr_dev_info_get(dev, SR_DI_SAMPLERATES,
                                        (const void **)&samplerates) != SR_OK) {
                                printf("\n");
                                continue;
                        }
                        if (sr_dev_info_get(dev, SR_DI_SAMPLERATES,
                                        (const void **)&samplerates) != SR_OK) {
                                printf("\n");
                                continue;
                        }

-

                        if (samplerates->step) {
                                /* low */
                                if (!(s = sr_samplerate_string(samplerates->low)))
                        if (samplerates->step) {
                                /* low */
                                if (!(s = sr_samplerate_string(samplerates->low)))


@@ -276,11 +280,85 @@ static void show_dev_detail(void)
                                g_free(s);
                        } else {
                                printf(" - supported samplerates:\n");
                                g_free(s);
                        } else {
                                printf(" - supported samplerates:\n");

-                               for (i = 0; samplerates->list[i]; i++) {
+                               for (i = 0; samplerates->list[i]; i++)

                                        printf("      %s\n", sr_samplerate_string(samplerates->list[i]));
                                        printf("      %s\n", sr_samplerate_string(samplerates->list[i]));

-                               }

                        }
                        }

+
+               } else if (hwo->hwcap == SR_HWCAP_BUFFERSIZE) {
+                       /* Supported buffer sizes */
+                       printf("    %s", hwo->shortname);
+                       if (sr_dev_info_get(dev, SR_DI_BUFFERSIZES,
+                                       (const void **)&integers) != SR_OK) {
+                               printf("\n");
+                               continue;
+                       }
+                       printf(" - supported buffer sizes:\n");
+                       for (i = 0; integers[i]; i++)
+                               printf("      %"PRIu64"\n", integers[i]);
+
+               } else if (hwo->hwcap == SR_HWCAP_TIMEBASE) {
+                       /* Supported time bases */
+                       printf("    %s", hwo->shortname);
+                       if (sr_dev_info_get(dev, SR_DI_TIMEBASES,
+                                       (const void **)&rationals) != SR_OK) {
+                               printf("\n");
+                               continue;
+                       }
+                       printf(" - supported time bases:\n");
+                       for (i = 0; rationals[i].p && rationals[i].q; i++)
+                               printf("      %s\n", sr_period_string(
+                                               rationals[i].p * rationals[i].q));
+
+               } else if (hwo->hwcap == SR_HWCAP_TRIGGER_SOURCE) {
+                       /* Supported trigger sources */
+                       printf("    %s", hwo->shortname);
+                       if (sr_dev_info_get(dev, SR_DI_TRIGGER_SOURCES,
+                                       (const void **)&stropts) != SR_OK) {
+                               printf("\n");
+                               continue;
+                       }
+                       printf(" - supported trigger sources:\n");
+                       for (i = 0; stropts[i]; i++)
+                               printf("      %s\n", stropts[i]);
+
+               } else if (hwo->hwcap == SR_HWCAP_FILTER) {
+                       /* Supported trigger sources */
+                       printf("    %s", hwo->shortname);
+                       if (sr_dev_info_get(dev, SR_DI_FILTERS,
+                                       (const void **)&stropts) != SR_OK) {
+                               printf("\n");
+                               continue;
+                       }
+                       printf(" - supported filter targets:\n");
+                       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 {
                } else {

+                       /* Everything else */

                        printf("    %s\n", hwo->shortname);
                }
        }
                        printf("    %s\n", hwo->shortname);
                }
        }


@@ -346,22 +424,21 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet)
 {
        static struct sr_output *o = NULL;
        static int logic_probelist[SR_MAX_NUM_PROBES] = { 0 };
 {
        static struct sr_output *o = NULL;
        static int logic_probelist[SR_MAX_NUM_PROBES] = { 0 };

-       static int analog_probelist[SR_MAX_NUM_PROBES] = { 0 };
+       static struct sr_probe *analog_probelist[SR_MAX_NUM_PROBES];

        static uint64_t received_samples = 0;
        static int unitsize = 0;
        static int triggered = 0;
        static FILE *outfile = NULL;
        static int num_analog_probes = 0;
        struct sr_probe *probe;
        static uint64_t received_samples = 0;
        static int unitsize = 0;
        static int triggered = 0;
        static FILE *outfile = NULL;
        static int num_analog_probes = 0;
        struct sr_probe *probe;

-       struct sr_datafeed_header *header;

        struct sr_datafeed_logic *logic;
        struct sr_datafeed_meta_logic *meta_logic;
        struct sr_datafeed_analog *analog;
        struct sr_datafeed_meta_analog *meta_analog;
        struct sr_datafeed_logic *logic;
        struct sr_datafeed_meta_logic *meta_logic;
        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, ret, i;
        uint64_t output_len, filter_out_len;
        uint8_t *output_buf, *filter_out;
        int num_enabled_probes, sample_size, ret, i;
        uint64_t output_len, filter_out_len;
        uint8_t *output_buf, *filter_out;

-       float asample1, asample2;

 
        /* If the first packet to come in isn't a header, don't even try. */
        if (packet->type != SR_DF_HEADER && o == NULL)
 
        /* If the first packet to come in isn't a header, don't even try. */
        if (packet->type != SR_DF_HEADER && o == NULL)


@@ -395,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 (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);
                                if (outfile)
                                        fwrite(output_buf, 1, output_len, outfile);
                                g_free(output_buf);


@@ -504,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);
                        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);
                        }
                                fwrite(output_buf, 1, output_len, outfile);
                                g_free(output_buf);
                        }


@@ -519,11 +596,11 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet)
                g_message("cli: Received SR_DF_META_ANALOG");
                meta_analog = packet->payload;
                num_analog_probes = meta_analog->num_probes;
                g_message("cli: Received SR_DF_META_ANALOG");
                meta_analog = packet->payload;
                num_analog_probes = meta_analog->num_probes;

-               num_enabled_probes = 0;
+               num_enabled_analog_probes = 0;

                for (i = 0; i < num_analog_probes; i++) {
                        probe = g_slist_nth_data(dev->probes, i);
                        if (probe->enabled)
                for (i = 0; i < num_analog_probes; i++) {
                        probe = g_slist_nth_data(dev->probes, i);
                        if (probe->enabled)

-                               analog_probelist[num_enabled_probes++] = probe->index;
+                               analog_probelist[num_enabled_analog_probes++] = probe;

                }
 
                outfile = stdout;
                }
 
                outfile = stdout;


@@ -544,9 +621,6 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet)
                                outfile = g_fopen(opt_output_file, "wb");
                        }
                }
                                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:
                break;
 
        case SR_DF_ANALOG:


@@ -558,28 +632,41 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet)
                if (limit_samples && received_samples >= limit_samples)
                        break;
 
                if (limit_samples && received_samples >= limit_samples)
                        break;
 

-               for (i = 0; i < analog->num_samples; i++) {
-                       asample1 = analog->data[i * num_analog_probes];
-                       asample2 = analog->data[i * num_analog_probes + 1];
-                       printf("CH1 %f   CH2 %f\n", asample1, asample2);
-//                     write(STDOUT_FILENO, &asample1, sizeof(float));
+               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);
+                       }

                }
 
                }
 

-//             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:
                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:
                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:
                break;
 
        default:


@@ -662,7 +749,7 @@ int setup_pd_stack(void)
 {
        struct srd_decoder_inst *di_from, *di_to;
        int ret, i;
 {
        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);
 
        /* Set up the protocol decoder stack. */
        pds = g_strsplit(opt_pds, ",", 0);


@@ -678,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_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++) {
                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_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;
 
                        if ((ret = srd_inst_stack(di_from, di_to)) != SRD_OK)
                                return 1;
 


@@ -768,6 +864,7 @@ int setup_output_format(void)
                 */
                default_output_format = TRUE;
        }
                 */
                default_output_format = TRUE;
        }

+

        fmtargs = parse_generic_arg(opt_output_format);
        fmtspec = g_hash_table_lookup(fmtargs, "sigrok_key");
        if (!fmtspec) {
        fmtargs = parse_generic_arg(opt_output_format);
        fmtspec = g_hash_table_lookup(fmtargs, "sigrok_key");
        if (!fmtspec) {


@@ -1008,9 +1105,11 @@ static int set_dev_options(struct sr_dev *dev, GHashTable *args)
        GHashTableIter iter;
        gpointer key, value;
        int ret, i;
        GHashTableIter iter;
        gpointer key, value;
        int ret, i;

+       float tmp_float;

        uint64_t tmp_u64;
        uint64_t tmp_u64;

-       gboolean found;
+       struct sr_rational tmp_rat;

        gboolean tmp_bool;
        gboolean tmp_bool;

+       gboolean found;

 
        g_hash_table_iter_init(&iter, args);
        while (g_hash_table_iter_next(&iter, &key, &value)) {
 
        g_hash_table_iter_init(&iter, args);
        while (g_hash_table_iter_next(&iter, &key, &value)) {


@@ -1045,6 +1144,23 @@ static int set_dev_options(struct sr_dev *dev, GHashTable *args)
                                                sr_hwcap_options[i].hwcap, 
                                                GINT_TO_POINTER(tmp_bool));
                                break;
                                                sr_hwcap_options[i].hwcap, 
                                                GINT_TO_POINTER(tmp_bool));
                                break;

+                       case SR_T_FLOAT:
+                               tmp_float = strtof(value, NULL);
+                               ret = dev->driver->dev_config_set(dev->driver_index,
+                                               sr_hwcap_options[i].hwcap, &tmp_float);
+                               break;
+                       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;
                        }
                        default:
                                ret = SR_ERR;
                        }