Build: Include <config.h> first in all source files

[sigrok-cli.git] / session.c

diff --git a/session.c b/session.c
index b045119483a8238b1091fd8bf2c42e1c4343e98d..6f402056c0eadfdac17b4ad829bf191aa2bdbf5e 100644 (file)
--- a/session.c
+++ b/session.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <string.h>
@@ -74,7 +75,7 @@ static int set_limit_time(const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-const struct sr_output *setup_output_format(const struct sr_dev_inst *sdi)
+const struct sr_output *setup_output_format(const struct sr_dev_inst *sdi, FILE **outfile)
 {
        const struct sr_output_module *omod;
        const struct sr_option **options;
@@ -104,6 +105,15 @@ const struct sr_output *setup_output_format(const struct sr_dev_inst *sdi)
                fmtopts = NULL;
        o = sr_output_new(omod, fmtopts, sdi, opt_output_file);
 
+       if (opt_output_file) {
+               if (!sr_output_test_flag(omod, SR_OUTPUT_INTERNAL_IO_HANDLING))
+                       *outfile = g_fopen(opt_output_file, "wb");
+               else
+                       *outfile = NULL;
+       } else {
+               *outfile = stdout;
+       }
+
        if (fmtopts)
                g_hash_table_destroy(fmtopts);
        g_hash_table_destroy(fmtargs);
@@ -174,17 +184,12 @@ void datafeed_in(const struct sr_dev_inst *sdi,
        switch (packet->type) {
        case SR_DF_HEADER:
                g_debug("cli: Received SR_DF_HEADER.");
-               if (!(o = setup_output_format(sdi)))
+               if (!(o = setup_output_format(sdi, &outfile)))
                        g_critical("Failed to initialize output module.");
 
                /* Set up backup analog output module. */
                oa = sr_output_new(sr_output_find("analog"), NULL, sdi, NULL);
 
-               if (opt_output_file)
-                       outfile = g_fopen(opt_output_file, "wb");
-               else
-                       outfile = stdout;
-
                rcvd_samples_logic = rcvd_samples_analog = 0;
 
                if (maybe_config_get(driver, sdi, NULL, SR_CONF_SAMPLERATE,
@@ -267,7 +272,7 @@ void datafeed_in(const struct sr_dev_inst *sdi,
                if (opt_pds) {
 #ifdef HAVE_SRD
                        if (srd_session_send(srd_sess, rcvd_samples_logic, end_sample,
-                                       logic->data, input_len) != SRD_OK)
+                                       logic->data, input_len, logic->unitsize) != SRD_OK)
                                sr_session_stop(session);
 #endif
                }
@@ -299,7 +304,7 @@ void datafeed_in(const struct sr_dev_inst *sdi,
                break;
        }
 
-       if (o && outfile && !opt_pds) {
+       if (o && !opt_pds) {
                if (sr_output_send(o, packet, &out) == SR_OK) {
                        if (!out || (out->len == 0
                                        && !opt_output_format
@@ -310,7 +315,7 @@ void datafeed_in(const struct sr_dev_inst *sdi,
                                 */
                                sr_output_send(oa, packet, &out);
                        }
-                       if (out && out->len > 0) {
+                       if (outfile && out && out->len > 0) {
                                fwrite(out->str, 1, out->len, outfile);
                                fflush(outfile);
                        }
@@ -350,16 +355,17 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 
 int opt_to_gvar(char *key, char *value, struct sr_config *src)
 {
-       const struct sr_config_info *srci;
+       const struct sr_key_info *srci, *srmqi;
        double tmp_double, dlow, dhigh;
-       uint64_t tmp_u64, p, q, low, high;
-       GVariant *rational[2], *range[2];
+       uint64_t tmp_u64, p, q, low, high, mqflags;
+       uint32_t mq;
+       GVariant *rational[2], *range[2], *gtup[2];
        GVariantBuilder *vbl;
        gboolean tmp_bool;
        gchar **keyval;
-       int ret;
+       int ret, i;
 
-       if (!(srci = sr_config_info_name_get(key))) {
+       if (!(srci = sr_key_info_name_get(SR_KEY_CONFIG, key))) {
                g_critical("Unknown device option '%s'.", (char *) key);
                return -1;
        }
@@ -448,6 +454,33 @@ int opt_to_gvar(char *key, char *value, struct sr_config *src)
                        g_strfreev(keyval);
                }
                break;
+       case SR_T_MQ:
+               /*
+                 Argument is MQ id e.g. ("voltage") optionally followed by one
+                 or more /<mqflag> e.g. "/ac".
+                */
+               keyval = g_strsplit(value, "/", 0);
+               if (!keyval[0] || !(srmqi = sr_key_info_name_get(SR_KEY_MQ, keyval[0]))) {
+                       g_strfreev(keyval);
+                       ret = -1;
+                       break;
+               }
+               mq = srmqi->key;
+               mqflags = 0;
+               for (i = 1; keyval[i]; i++) {
+                       if (!(srmqi = sr_key_info_name_get(SR_KEY_MQFLAGS, keyval[i]))) {
+                               ret = -1;
+                               break;
+                       }
+                       mqflags |= srmqi->key;
+               }
+               g_strfreev(keyval);
+               if (ret != -1) {
+                       gtup[0] = g_variant_new_uint32(mq);
+                       gtup[1] = g_variant_new_uint64(mqflags);
+                       src->data = g_variant_new_tuple(gtup, 2);
+               }
+               break;
        default:
                g_critical("Unknown data type specified for option '%s' "
                           "(driver implementation bug?).", key);
@@ -574,6 +607,7 @@ void run_session(void)
                return;
        }
 
+       trigger = NULL;
        if (opt_triggers) {
                if (!parse_triggerstring(sdi, opt_triggers, &trigger)) {
                        sr_session_destroy(session);
@@ -662,6 +696,9 @@ void run_session(void)
        if (opt_continuous)
                clear_anykey();
 
+       if (trigger)
+               sr_trigger_free(trigger);
+
        sr_session_datafeed_callback_remove_all(session);
        sr_session_destroy(session);