Adapt to new <libsigrokdecode/libsigrokdecode.h> header.

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

diff --git a/sigrok-cli.c b/sigrok-cli.c
index ade15cd31f137b00226f80fcbd857d7dc6bcfa69..92ce7ea64aa961a8bd9c7fa77f8c281d8e0f3480 100644 (file)
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #ifdef HAVE_SRD
-#include <sigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include <libsigrokdecode/libsigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #endif
 #include <stdio.h>
 #include <stdlib.h>
@@ -52,12 +52,12 @@ static GByteArray *savebuf;
 
 static gboolean opt_version = FALSE;
 static gint opt_loglevel = SR_LOG_WARN; /* Show errors+warnings per default. */
-static gboolean opt_list_devs = FALSE;
+static gboolean opt_scan_devs = FALSE;
 static gboolean opt_wait_trigger = FALSE;
 static gchar *opt_input_file = NULL;
 static gchar *opt_output_file = NULL;
 static gchar *opt_drv = NULL;
-static gchar *opt_dev = NULL;
+static gchar *opt_config = NULL;
 static gchar *opt_probes = NULL;
 static gchar *opt_triggers = NULL;
 static gchar *opt_pds = NULL;
@@ -78,13 +78,11 @@ static GOptionEntry optargs[] = {
        {"version", 'V', 0, G_OPTION_ARG_NONE, &opt_version,
                        "Show version and support list", NULL},
        {"loglevel", 'l', 0, G_OPTION_ARG_INT, &opt_loglevel,
-                       "Set libsigrok/libsigrokdecode loglevel", NULL},
-       {"list-devices", 'D', 0, G_OPTION_ARG_NONE, &opt_list_devs,
-                       "Scan for devices", NULL},
-       {"driver", 0, 0, G_OPTION_ARG_STRING, &opt_drv,
-                       "Use only this driver", NULL},
-       {"device", 'd', 0, G_OPTION_ARG_STRING, &opt_dev,
-                       "Use specified device", NULL},
+                       "Set loglevel (5 is most verbose)", NULL},
+       {"driver", 'd', 0, G_OPTION_ARG_STRING, &opt_drv,
+                       "The driver to use", NULL},
+       {"config", 'c', 0, G_OPTION_ARG_STRING, &opt_config,
+                       "Specify device configuration options", NULL},
        {"input-file", 'i', 0, G_OPTION_ARG_FILENAME, &opt_input_file,
                        "Load input from file", NULL},
        {"input-format", 'I', 0, G_OPTION_ARG_STRING, &opt_input_format,
@@ -100,13 +98,15 @@ static GOptionEntry optargs[] = {
        {"wait-trigger", 'w', 0, G_OPTION_ARG_NONE, &opt_wait_trigger,
                        "Wait for trigger", NULL},
 #ifdef HAVE_SRD
-       {"protocol-decoders", 'a', 0, G_OPTION_ARG_STRING, &opt_pds,
+       {"protocol-decoders", 'P', 0, G_OPTION_ARG_STRING, &opt_pds,
                        "Protocol decoders to run", NULL},
-       {"protocol-decoder-stack", 's', 0, G_OPTION_ARG_STRING, &opt_pd_stack,
+       {"protocol-decoder-stack", 'S', 0, G_OPTION_ARG_STRING, &opt_pd_stack,
                        "Protocol decoder stack", NULL},
        {"protocol-decoder-annotations", 'A', 0, G_OPTION_ARG_STRING, &opt_pd_annotations,
                        "Protocol decoder annotation(s) to show", NULL},
 #endif
+       {"scan", 0, 0, G_OPTION_ARG_NONE, &opt_scan_devs,
+                       "Scan for devices", NULL},
        {"show", 0, 0, G_OPTION_ARG_NONE, &opt_show,
                        "Show device detail", NULL},
        {"time", 0, 0, G_OPTION_ARG_STRING, &opt_time,
@@ -344,7 +344,7 @@ static void show_dev_detail(void)
        num_devices = g_slist_length(devices);
        if (num_devices > 1) {
                g_critical("%d devices found. Use --list-devices to show them, "
-                               "and --device to select one.", num_devices);
+                               "and select one to show.", num_devices);
                return;
        }
 
@@ -543,7 +543,6 @@ static void show_dev_detail(void)
                        g_variant_unref(gvar);
 
                } else if (srci->key == SR_CONF_DATALOG) {
-                       /* TODO test */
                        /* Turning on/off internal data logging. */
                        printf("    %s\t(on/off", srci->id);
                        if (sr_config_get(sdi->driver, SR_CONF_DATALOG,
@@ -872,15 +871,15 @@ static void datafeed_in(const struct sr_dev_inst *sdi,
                break;
        }
 
-       if (o && o->format->recv) {
-               out = o->format->recv(o, sdi, packet);
-               if (out && out->len) {
+       if (o && o->format->receive) {
+               if (o->format->receive(o, sdi, packet, &out) == SR_OK && out) {
                        fwrite(out->str, 1, out->len, outfile);
                        fflush(outfile);
+                       g_string_free(out, TRUE);
                }
        }
 
-       /* SR_DF_END needs to be handled after the output module's recv()
+       /* SR_DF_END needs to be handled after the output module's receive()
         * is called, so it can properly clean up that module etc. */
        if (packet->type == SR_DF_END) {
                g_debug("cli: Received SR_DF_END");
@@ -1514,12 +1513,12 @@ static void set_options(void)
        GSList *devices;
        GHashTable *devargs;
 
-       if (!opt_dev) {
+       if (!opt_config) {
                g_critical("No setting specified.");
                return;
        }
 
-       if (!(devargs = parse_generic_arg(opt_dev, FALSE)))
+       if (!(devargs = parse_generic_arg(opt_config, FALSE)))
                return;
 
        if (!(devices = device_scan())) {
@@ -1615,8 +1614,8 @@ static void run_session(void)
                return;
        }
 
-       if (opt_dev) {
-               if ((devargs = parse_generic_arg(opt_dev, FALSE))) {
+       if (opt_config) {
+               if ((devargs = parse_generic_arg(opt_config, FALSE))) {
                        if (set_dev_options(sdi, devargs) != SR_OK)
                                return;
                        g_hash_table_destroy(devargs);
@@ -1772,7 +1771,7 @@ int main(int argc, char **argv)
 
        if (opt_version)
                show_version();
-       else if (opt_list_devs)
+       else if (opt_scan_devs)
                show_dev_list();
 #ifdef HAVE_SRD
        else if (opt_pds && opt_show)