cli: support for frames, and limiting capture by number of frames.
[sigrok-cli.git] / sigrok-cli.c
index 33d8ebbedb5f979cf02f557a8c230e8ed566a860..fe38824e4c59526d7a3f5850404cfe8e2cc1804b 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * This file is part of the sigrok project.
  *
- * Copyright (C) 2010 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
 
 extern struct sr_hwcap_option sr_hwcap_options[];
 
-static gboolean debug = 0;
 static uint64_t limit_samples = 0;
+static uint64_t limit_frames = 0;
 static struct sr_output_format *output_format = NULL;
 static int default_output_format = FALSE;
 static char *output_format_param = NULL;
 static char *input_format_param = NULL;
-static GData *pd_ann_visible = NULL;
+static GHashTable *pd_ann_visible = NULL;
 
 static gboolean opt_version = FALSE;
 static gint opt_loglevel = SR_LOG_WARN; /* Show errors+warnings per default. */
-static gboolean opt_list_devices = FALSE;
+static gboolean opt_list_devs = FALSE;
 static gboolean opt_wait_trigger = FALSE;
 static gchar *opt_input_file = NULL;
 static gchar *opt_output_file = NULL;
-static gchar *opt_device = NULL;
+static gchar *opt_dev = NULL;
 static gchar *opt_probes = NULL;
 static gchar *opt_triggers = NULL;
 static gchar *opt_pds = NULL;
 static gchar *opt_pd_stack = NULL;
+static gchar *opt_pd_annotations = NULL;
 static gchar *opt_input_format = NULL;
-static gchar *opt_format = NULL;
+static gchar *opt_output_format = NULL;
 static gchar *opt_time = NULL;
 static gchar *opt_samples = NULL;
+static gchar *opt_frames = NULL;
 static gchar *opt_continuous = NULL;
 
 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, "Select libsigrok loglevel", NULL},
-       {"list-devices", 'D', 0, G_OPTION_ARG_NONE, &opt_list_devices, "List devices", NULL},
-       {"input-file", 'i', 0, G_OPTION_ARG_FILENAME, &opt_input_file, "Load input from file", NULL},
-       {"output-file", 'o', 0, G_OPTION_ARG_FILENAME, &opt_output_file, "Save output to file", NULL},
-       {"device", 'd', 0, G_OPTION_ARG_STRING, &opt_device, "Use device ID", NULL},
-       {"probes", 'p', 0, G_OPTION_ARG_STRING, &opt_probes, "Probes to use", NULL},
-       {"triggers", 't', 0, G_OPTION_ARG_STRING, &opt_triggers, "Trigger configuration", NULL},
-       {"wait-trigger", 'w', 0, G_OPTION_ARG_NONE, &opt_wait_trigger, "Wait for trigger", NULL},
-       {"protocol-decoders", 'a', 0, G_OPTION_ARG_STRING, &opt_pds, "Protocol decoder sequence", NULL},
-       {"protocol-decoder-stack", 's', 0, G_OPTION_ARG_STRING, &opt_pd_stack, "Protocol decoder stack", NULL},
-       {"input-format", 'I', 0, G_OPTION_ARG_STRING, &opt_input_format, "Input format", NULL},
-       {"format", 'f', 0, G_OPTION_ARG_STRING, &opt_format, "Output format", NULL},
-       {"time", 0, 0, G_OPTION_ARG_STRING, &opt_time, "How long to sample (ms)", NULL},
-       {"samples", 0, 0, G_OPTION_ARG_STRING, &opt_samples, "Number of samples to acquire", NULL},
-       {"continuous", 0, 0, G_OPTION_ARG_NONE, &opt_continuous, "Sample continuously", NULL},
+       {"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},
+       {"device", 'd', 0, G_OPTION_ARG_STRING, &opt_dev,
+                       "Use specified device", 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,
+                       "Input format", NULL},
+       {"output-file", 'o', 0, G_OPTION_ARG_FILENAME, &opt_output_file,
+                       "Save output to file", NULL},
+       {"output-format", 'O', 0, G_OPTION_ARG_STRING, &opt_output_format,
+                       "Output format", NULL},
+       {"probes", 'p', 0, G_OPTION_ARG_STRING, &opt_probes,
+                       "Probes to use", NULL},
+       {"triggers", 't', 0, G_OPTION_ARG_STRING, &opt_triggers,
+                       "Trigger configuration", NULL},
+       {"wait-trigger", 'w', 0, G_OPTION_ARG_NONE, &opt_wait_trigger,
+                       "Wait for trigger", NULL},
+       {"protocol-decoders", 'a', 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", NULL},
+       {"protocol-decoder-annotations", 'A', 0, G_OPTION_ARG_STRING, &opt_pd_annotations,
+                       "Protocol decoder annotation(s) to show", NULL},
+       {"time", 0, 0, G_OPTION_ARG_STRING, &opt_time,
+                       "How long to sample (ms)", NULL},
+       {"samples", 0, 0, G_OPTION_ARG_STRING, &opt_samples,
+                       "Number of samples to acquire", NULL},
+       {"frames", 0, 0, G_OPTION_ARG_STRING, &opt_frames,
+                       "Number of frames to acquire", NULL},
+       {"continuous", 0, 0, G_OPTION_ARG_NONE, &opt_continuous,
+                       "Sample continuously", NULL},
        {NULL, 0, 0, 0, NULL, NULL, NULL}
 };
 
 static void show_version(void)
 {
-       GSList *plugins, *p, *l;
-       struct sr_device_plugin *plugin;
+       GSList *l;
+       struct sr_dev_driver **drivers;
        struct sr_input_format **inputs;
        struct sr_output_format **outputs;
        struct srd_decoder *dec;
        int i;
 
        printf("sigrok-cli %s\n\n", VERSION);
+
+       printf("Using libsigrok %s (lib version %s).\n",
+              sr_package_version_string_get(), sr_lib_version_string_get());
+       printf("Using libsigrokdecode %s (lib version %s).\n\n",
+              srd_package_version_string_get(), srd_lib_version_string_get());
+
        printf("Supported hardware drivers:\n");
-       plugins = sr_list_hwplugins();
-       for (p = plugins; p; p = p->next) {
-               plugin = p->data;
-               printf("  %-20s %s\n", plugin->name, plugin->longname);
+       drivers = sr_driver_list();
+       for (i = 0; drivers[i]; i++) {
+               printf("  %-20s %s\n", drivers[i]->name, drivers[i]->longname);
        }
        printf("\n");
 
@@ -113,24 +140,26 @@ static void show_version(void)
                printf("  %-20s %s\n", outputs[i]->id, outputs[i]->description);
        printf("\n");
 
-       /* TODO: Error handling. */
-       srd_init();
-
-       printf("Supported protocol decoders:\n");
-       for (l = srd_list_decoders(); l; l = l->next) {
-               dec = l->data;
-               printf("  %-20s %s\n", dec->id, dec->desc);
+       if (srd_init(NULL) == SRD_OK) {
+               printf("Supported protocol decoders:\n");
+               srd_decoder_load_all();
+               for (l = srd_decoder_list(); l; l = l->next) {
+                       dec = l->data;
+                       printf("  %-20s %s\n", dec->id, dec->longname);
+                       /* Print protocol description upon "-l 3" or higher. */
+                       if (opt_loglevel >= SR_LOG_INFO)
+                               printf("  %-20s %s\n", "", dec->desc);
+               }
+               srd_exit();
        }
        printf("\n");
-
-       srd_exit();
 }
 
-static void print_device_line(struct sr_device *device)
+static void print_dev_line(const struct sr_dev *dev)
 {
-       struct sr_device_instance *sdi;
+       const struct sr_dev_inst *sdi;
 
-       sdi = device->plugin->get_device_info(device->plugin_index, SR_DI_INSTANCE);
+       sr_dev_info_get(dev, SR_DI_INST, (const void **)&sdi);
 
        if (sdi->vendor && sdi->vendor[0])
                printf("%s ", sdi->vendor);
@@ -138,58 +167,59 @@ static void print_device_line(struct sr_device *device)
                printf("%s ", sdi->model);
        if (sdi->version && sdi->version[0])
                printf("%s ", sdi->version);
-       if (device->probes)
-               printf("with %d probes", g_slist_length(device->probes));
+       if (dev->probes)
+               printf("with %d probes", g_slist_length(dev->probes));
        printf("\n");
 }
 
-static void show_device_list(void)
+static void show_dev_list(void)
 {
-       struct sr_device *device, *demo_device;
-       GSList *devices, *l;
+       struct sr_dev *dev, *demo_dev;
+       GSList *devs, *l;
        int devcnt;
 
        devcnt = 0;
-       devices = sr_device_list();
+       devs = sr_dev_list();
 
-       if (g_slist_length(devices) == 0)
+       if (g_slist_length(devs) == 0)
                return;
 
        printf("The following devices were found:\nID    Device\n");
-       demo_device = NULL;
-       for (l = devices; l; l = l->next) {
-               device = l->data;
-               if (strstr(device->plugin->name, "demo")) {
-                       demo_device = device;
+       demo_dev = NULL;
+       for (l = devs; l; l = l->next) {
+               dev = l->data;
+               if (sr_dev_has_hwcap(dev, SR_HWCAP_DEMO_DEV)) {
+                       demo_dev = dev;
                        continue;
                }
                printf("%-3d   ", devcnt++);
-               print_device_line(device);
+               print_dev_line(dev);
        }
-       if (demo_device) {
+       if (demo_dev) {
                printf("demo  ");
-               print_device_line(demo_device);
+               print_dev_line(demo_dev);
        }
 }
 
-static void show_device_detail(void)
+static void show_dev_detail(void)
 {
-       struct sr_device *device;
+       struct sr_dev *dev;
        struct sr_hwcap_option *hwo;
-       struct sr_samplerates *samplerates;
-       int cap, *capabilities, i;
-       char *s, *title, *charopts, **stropts;
+       const struct sr_samplerates *samplerates;
+       int cap, *hwcaps, i;
+       char *s, *title;
+       const char *charopts, **stropts;
 
-       device = parse_devicestring(opt_device);
-       if (!device) {
+       dev = parse_devstring(opt_dev);
+       if (!dev) {
                printf("No such device. Use -D to list all devices.\n");
                return;
        }
 
-       print_device_line(device);
+       print_dev_line(dev);
 
-       if ((charopts = (char *)device->plugin->get_device_info(
-                       device->plugin_index, SR_DI_TRIGGER_TYPES))) {
+       if (sr_dev_info_get(dev, SR_DI_TRIGGER_TYPES,
+                                       (const void **)&charopts) == SR_OK) {
                printf("Supported triggers: ");
                while (*charopts) {
                        printf("%c ", *charopts);
@@ -199,9 +229,9 @@ static void show_device_detail(void)
        }
 
        title = "Supported options:\n";
-       capabilities = device->plugin->get_capabilities();
-       for (cap = 0; capabilities[cap]; cap++) {
-               if (!(hwo = sr_find_hwcap_option(capabilities[cap])))
+       hwcaps = dev->driver->hwcap_get_all();
+       for (cap = 0; hwcaps[cap]; cap++) {
+               if (!(hwo = sr_hw_hwcap_get(hwcaps[cap])))
                        continue;
 
                if (title) {
@@ -209,23 +239,21 @@ static void show_device_detail(void)
                        title = NULL;
                }
 
-               if (hwo->capability == SR_HWCAP_PATTERN_MODE) {
+               if (hwo->hwcap == SR_HWCAP_PATTERN_MODE) {
                        printf("    %s", hwo->shortname);
-                       stropts = (char **)device->plugin->get_device_info(
-                                       device->plugin_index, SR_DI_PATTERNMODES);
-                       if (!stropts) {
+                       if (sr_dev_info_get(dev, SR_DI_PATTERNS,
+                                       (const void **)&stropts) == SR_OK) {
+                               printf(" - supported patterns:\n");
+                               for (i = 0; stropts[i]; i++)
+                                       printf("      %s\n", stropts[i]);
+                       } else {
                                printf("\n");
-                               continue;
                        }
-                       printf(" - supported modes:\n");
-                       for (i = 0; stropts[i]; i++)
-                               printf("      %s\n", stropts[i]);
-               } else if (hwo->capability == SR_HWCAP_SAMPLERATE) {
+               } else if (hwo->hwcap == SR_HWCAP_SAMPLERATE) {
                        printf("    %s", hwo->shortname);
                        /* Supported samplerates */
-                       samplerates = device->plugin->get_device_info(
-                               device->plugin_index, SR_DI_SAMPLERATES);
-                       if (!samplerates) {
+                       if (sr_dev_info_get(dev, SR_DI_SAMPLERATES,
+                                       (const void **)&samplerates) != SR_OK) {
                                printf("\n");
                                continue;
                        }
@@ -235,21 +263,21 @@ static void show_device_detail(void)
                                if (!(s = sr_samplerate_string(samplerates->low)))
                                        continue;
                                printf(" (%s", s);
-                               free(s);
+                               g_free(s);
                                /* high */
                                if (!(s = sr_samplerate_string(samplerates->high)))
                                        continue;
                                printf(" - %s", s);
-                               free(s);
+                               g_free(s);
                                /* step */
                                if (!(s = sr_samplerate_string(samplerates->step)))
                                        continue;
                                printf(" in steps of %s)\n", s);
-                               free(s);
+                               g_free(s);
                        } else {
                                printf(" - supported samplerates:\n");
                                for (i = 0; samplerates->list[i]; i++) {
-                                       printf("      %7s\n", sr_samplerate_string(samplerates->list[i]));
+                                       printf("      %s\n", sr_samplerate_string(samplerates->list[i]));
                                }
                        }
                } else {
@@ -258,20 +286,82 @@ static void show_device_detail(void)
        }
 }
 
-static void datafeed_in(struct sr_device *device, struct sr_datafeed_packet *packet)
+static void show_pd_detail(void)
+{
+       GSList *l;
+       struct srd_decoder *dec;
+       char **pdtokens, **pdtok, **ann, *doc;
+       struct srd_probe *p;
+
+       pdtokens = g_strsplit(opt_pds, ",", -1);
+       for (pdtok = pdtokens; *pdtok; pdtok++) {
+               if (!(dec = srd_decoder_get_by_id(*pdtok))) {
+                       printf("Protocol decoder %s not found.\n", *pdtok);
+                       return;
+               }
+               printf("ID: %s\nName: %s\nLong name: %s\nDescription: %s\n",
+                               dec->id, dec->name, dec->longname, dec->desc);
+               printf("License: %s\n", dec->license);
+               printf("Annotations:\n");
+               if (dec->annotations) {
+                       for (l = dec->annotations; l; l = l->next) {
+                               ann = l->data;
+                               printf("- %s\n  %s\n", ann[0], ann[1]);
+                       }
+               } else {
+                       printf("None.\n");
+               }
+               /* TODO: Print supported decoder options. */
+               printf("Required probes:\n");
+               if (dec->probes) {
+                       for (l = dec->probes; l; l = l->next) {
+                               p = l->data;
+                               printf("- %s (%s): %s\n",
+                                      p->name, p->id, p->desc);
+                       }
+               } else {
+                       printf("None.\n");
+               }
+               printf("Optional probes:\n");
+               if (dec->opt_probes) {
+                       for (l = dec->opt_probes; l; l = l->next) {
+                               p = l->data;
+                               printf("- %s (%s): %s\n",
+                                      p->name, p->id, p->desc);
+                       }
+               } else {
+                       printf("None.\n");
+               }
+               if ((doc = srd_decoder_doc_get(dec))) {
+                       printf("Documentation:\n%s\n",
+                              doc[0] == '\n' ? doc + 1 : doc);
+                       g_free(doc);
+               }
+       }
+
+       g_strfreev(pdtokens);
+}
+
+static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet)
 {
        static struct sr_output *o = NULL;
-       static int probelist[SR_MAX_NUM_PROBES] = { 0 };
+       static int logic_probelist[SR_MAX_NUM_PROBES] = { 0 };
+       static int analog_probelist[SR_MAX_NUM_PROBES] = { 0 };
        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;
        int num_enabled_probes, sample_size, ret, i;
        uint64_t output_len, filter_out_len;
-       char *output_buf, *filter_out;
+       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)
@@ -280,58 +370,27 @@ static void datafeed_in(struct sr_device *device, struct sr_datafeed_packet *pac
        sample_size = -1;
        switch (packet->type) {
        case SR_DF_HEADER:
-               g_message("cli: Received SR_DF_HEADER");
+               g_debug("cli: Received SR_DF_HEADER");
                /* Initialize the output module. */
-               if (!(o = malloc(sizeof(struct sr_output)))) {
-                       printf("Output module malloc failed.\n");
+               if (!(o = g_try_malloc(sizeof(struct sr_output)))) {
+                       g_critical("Output module malloc failed.");
                        exit(1);
                }
                o->format = output_format;
-               o->device = device;
+               o->dev = dev;
                o->param = output_format_param;
                if (o->format->init) {
                        if (o->format->init(o) != SR_OK) {
-                               printf("Output format initialization failed.\n");
+                               g_critical("Output format initialization failed.");
                                exit(1);
                        }
                }
-
-               header = packet->payload;
-               num_enabled_probes = 0;
-               for (i = 0; i < header->num_logic_probes; i++) {
-                       probe = g_slist_nth_data(device->probes, i);
-                       if (probe->enabled)
-                               probelist[num_enabled_probes++] = probe->index;
-               }
-               /* How many bytes we need to store num_enabled_probes bits */
-               unitsize = (num_enabled_probes + 7) / 8;
-
-               outfile = stdout;
-               if (opt_output_file) {
-                       if (default_output_format) {
-                               /* output file is in session format, which means we'll
-                                * dump everything in the datastore as it comes in,
-                                * and save from there after the session. */
-                               outfile = NULL;
-                               ret = sr_datastore_new(unitsize, &(device->datastore));
-                               if (ret != SR_OK) {
-                                       printf("Failed to create datastore.\n");
-                                       exit(1);
-                               }
-                       } else {
-                               /* saving to a file in whatever format was set
-                                * with --format, so all we need is a filehandle */
-                               outfile = g_fopen(opt_output_file, "wb");
-                       }
-               }
-               if (opt_pds)
-                       srd_session_start(num_enabled_probes, unitsize,
-                                       header->samplerate);
                break;
+
        case SR_DF_END:
-               g_message("cli: Received SR_DF_END");
+               g_debug("cli: Received SR_DF_END");
                if (!o) {
-                       g_message("cli: double end!");
+                       g_debug("cli: double end!");
                        break;
                }
                if (o->format->event) {
@@ -339,95 +398,193 @@ static void datafeed_in(struct sr_device *device, struct sr_datafeed_packet *pac
                        if (output_len) {
                                if (outfile)
                                        fwrite(output_buf, 1, output_len, outfile);
-                               free(output_buf);
+                               g_free(output_buf);
                                output_len = 0;
                        }
                }
                if (limit_samples && received_samples < limit_samples)
-                       printf("Device only sent %" PRIu64 " samples.\n",
+                       g_warning("Device only sent %" PRIu64 " samples.",
                               received_samples);
                if (opt_continuous)
-                       printf("Device stopped after %" PRIu64 " samples.\n",
+                       g_warning("Device stopped after %" PRIu64 " samples.",
                               received_samples);
                sr_session_halt();
                if (outfile && outfile != stdout)
                        fclose(outfile);
-               free(o);
+               g_free(o);
                o = NULL;
                break;
+
        case SR_DF_TRIGGER:
-               g_message("cli: received SR_DF_TRIGGER at %"PRIu64" ms",
-                               packet->timeoffset / 1000000);
+               g_debug("cli: received SR_DF_TRIGGER");
                if (o->format->event)
                        o->format->event(o, SR_DF_TRIGGER, &output_buf,
                                         &output_len);
                triggered = 1;
                break;
+
+       case SR_DF_META_LOGIC:
+               g_message("cli: Received SR_DF_META_LOGIC");
+               meta_logic = packet->payload;
+               num_enabled_probes = 0;
+               for (i = 0; i < meta_logic->num_probes; i++) {
+                       probe = g_slist_nth_data(dev->probes, i);
+                       if (probe->enabled)
+                               logic_probelist[num_enabled_probes++] = probe->index;
+               }
+               /* How many bytes we need to store num_enabled_probes bits */
+               unitsize = (num_enabled_probes + 7) / 8;
+
+               outfile = stdout;
+               if (opt_output_file) {
+                       if (default_output_format) {
+                               /* output file is in session format, which means we'll
+                                * dump everything in the datastore as it comes in,
+                                * and save from there after the session. */
+                               outfile = NULL;
+                               ret = sr_datastore_new(unitsize, &(dev->datastore));
+                               if (ret != SR_OK) {
+                                       printf("Failed to create datastore.\n");
+                                       exit(1);
+                               }
+                       } else {
+                               /* saving to a file in whatever format was set
+                                * with --format, so all we need is a filehandle */
+                               outfile = g_fopen(opt_output_file, "wb");
+                       }
+               }
+               if (opt_pds)
+                       srd_session_start(num_enabled_probes, unitsize,
+                                       meta_logic->samplerate);
+               break;
+
        case SR_DF_LOGIC:
                logic = packet->payload;
+               g_message("cli: received SR_DF_LOGIC, %"PRIu64" bytes", logic->length);
                sample_size = logic->unitsize;
-               g_message("cli: received SR_DF_LOGIC at %f ms duration %f ms, %"PRIu64" bytes",
-                               packet->timeoffset / 1000000.0, packet->duration / 1000000.0,
-                               logic->length);
-               break;
-       case SR_DF_ANALOG:
-               break;
-       }
+               if (logic->length == 0)
+                       break;
 
-       /* not supporting anything but SR_DF_LOGIC for now */
+               /* Don't store any samples until triggered. */
+               if (opt_wait_trigger && !triggered)
+                       break;
 
-       if (sample_size == -1 || logic->length == 0)
-               return;
+               if (limit_samples && received_samples >= limit_samples)
+                       break;
 
-       /* Don't store any samples until triggered. */
-       if (opt_wait_trigger && !triggered)
-               return;
+               ret = sr_filter_probes(sample_size, unitsize, logic_probelist,
+                                          logic->data, logic->length,
+                                          &filter_out, &filter_out_len);
+               if (ret != SR_OK)
+                       break;
 
-       if (limit_samples && received_samples >= limit_samples)
-               return;
+               /* what comes out of the filter is guaranteed to be packed into the
+                * minimum size needed to support the number of samples at this sample
+                * size. however, the driver may have submitted too much -- cut off
+                * the buffer of the last packet according to the sample limit.
+                */
+               if (limit_samples && (received_samples + logic->length / sample_size >
+                               limit_samples * sample_size))
+                       filter_out_len = limit_samples * sample_size - received_samples;
+
+               if (dev->datastore)
+                       sr_datastore_put(dev->datastore, filter_out,
+                                        filter_out_len, sample_size, logic_probelist);
+
+               if (opt_output_file && default_output_format)
+                       /* saving to a session file, don't need to do anything else
+                        * to this data for now. */
+                       goto cleanup;
+
+               if (opt_pds) {
+                       if (srd_session_send(received_samples, (uint8_t*)filter_out,
+                                       filter_out_len) != SRD_OK)
+                               sr_session_halt();
+               } else {
+                       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) {
+                               fwrite(output_buf, 1, output_len, outfile);
+                               g_free(output_buf);
+                       }
+               }
 
-       /* TODO: filters only support SR_DF_LOGIC */
-       ret = sr_filter_probes(sample_size, unitsize, probelist,
-                                  logic->data, logic->length,
-                                  &filter_out, &filter_out_len);
-       if (ret != SR_OK)
-               return;
+               cleanup:
+               g_free(filter_out);
+               received_samples += logic->length / sample_size;
+               break;
 
-       /* what comes out of the filter is guaranteed to be packed into the
-        * minimum size needed to support the number of samples at this sample
-        * size. however, the driver may have submitted too much -- cut off
-        * the buffer of the last packet according to the sample limit.
-        */
-       if (limit_samples && (received_samples + logic->length / sample_size >
-                       limit_samples * sample_size))
-               filter_out_len = limit_samples * sample_size - received_samples;
+       case SR_DF_META_ANALOG:
+               g_message("cli: Received SR_DF_META_ANALOG");
+               meta_analog = packet->payload;
+               num_analog_probes = meta_analog->num_probes;
+               num_enabled_probes = 0;
+               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;
+               }
+
+               outfile = stdout;
+               if (opt_output_file) {
+                       if (default_output_format) {
+                               /* output file is in session format, which means we'll
+                                * dump everything in the datastore as it comes in,
+                                * and save from there after the session. */
+                               outfile = NULL;
+                               ret = sr_datastore_new(unitsize, &(dev->datastore));
+                               if (ret != SR_OK) {
+                                       printf("Failed to create datastore.\n");
+                                       exit(1);
+                               }
+                       } else {
+                               /* saving to a file in whatever format was set
+                                * with --format, so all we need is a filehandle */
+                               outfile = g_fopen(opt_output_file, "wb");
+                       }
+               }
+//             if (opt_pds)
+//                     srd_session_start(num_enabled_probes, unitsize,
+//                                     meta_logic->samplerate);
+               break;
 
-       if (device->datastore)
-               sr_datastore_put(device->datastore, filter_out,
-                                filter_out_len, sample_size, probelist);
+       case SR_DF_ANALOG:
+               analog = packet->payload;
+               g_message("cli: received SR_DF_ANALOG, %d samples", analog->num_samples);
+               if (analog->num_samples == 0)
+                       break;
 
-       if (opt_output_file && default_output_format)
-               /* saving to a session file, don't need to do anything else
-                * to this data for now. */
-               goto cleanup;
+               if (limit_samples && received_samples >= limit_samples)
+                       break;
 
-       if (opt_pds) {
-               if (srd_session_feed(packet->timeoffset, packet->duration,
-                               (uint8_t*)filter_out, filter_out_len) != SRD_OK)
-                       abort();
-       } else {
-               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) {
-                       fwrite(output_buf, 1, output_len, outfile);
-                       free(output_buf);
+               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));
                }
-       }
 
-cleanup:
-       g_free(filter_out);
-       received_samples += logic->length / sample_size;
+//             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");
+               break;
+
+       case SR_DF_FRAME_END:
+               /* TODO */
+               printf("END\n");
+               break;
+
+       default:
+               g_message("received unknown packet type %d", packet->type);
+       }
 
 }
 
@@ -436,81 +593,242 @@ cleanup:
  * That will instantiate two SPI decoders on the clock but different data
  * lines.
  */
-static int register_pds(struct sr_device *device, const char *pdstring)
+static int register_pds(struct sr_dev *dev, const char *pdstring)
 {
-       gpointer dummy;
-       char **pdtokens, **pdtok;
+       GHashTable *pd_opthash;
+       struct srd_decoder_inst *di;
+       int ret;
+       char **pdtokens, **pdtok, *pd_name;
 
        /* Avoid compiler warnings. */
-       (void)device;
+       (void)dev;
+
+       ret = 0;
+       pd_ann_visible = g_hash_table_new_full(g_str_hash, g_int_equal,
+                       g_free, NULL);
+       pd_name = NULL;
+       pd_opthash = NULL;
+       pdtokens = g_strsplit(pdstring, ",", 0);
+       for (pdtok = pdtokens; *pdtok; pdtok++) {
+               if (!(pd_opthash = parse_generic_arg(*pdtok))) {
+                       g_critical("Invalid protocol decoder option '%s'.", *pdtok);
+                       goto err_out;
+               }
 
-       g_datalist_init(&pd_ann_visible);
-       pdtokens = g_strsplit(pdstring, ",", -1);
+               pd_name = g_strdup(g_hash_table_lookup(pd_opthash, "sigrok_key"));
+               g_hash_table_remove(pd_opthash, "sigrok_key");
+               if (srd_decoder_load(pd_name) != SRD_OK) {
+                       g_critical("Failed to load protocol decoder %s.", pd_name);
+                       ret = 1;
+                       goto err_out;
+               }
+               if (!(di = srd_inst_new(pd_name, pd_opthash))) {
+                       g_critical("Failed to instantiate protocol decoder %s.", pd_name);
+                       ret = 1;
+                       goto err_out;
+               }
 
-       /* anything, but not NULL */
-       dummy = register_pds;
-       for (pdtok = pdtokens; *pdtok; pdtok++) {
-               struct srd_decoder_instance *di;
-
-               /* Configure probes from command line */
-               char **optokens, **optok;
-               optokens = g_strsplit(*pdtok, ":", -1);
-               di = srd_instance_new(optokens[0], NULL);
-               if(!di) {
-                       fprintf(stderr, "Failed to instantiate PD: %s\n",
-                                       optokens[0]);
-                       g_strfreev(optokens);
-                       g_strfreev(pdtokens);
-                       return -1;
+               /* If no annotation list was specified, add them all in now.
+                * This will be pared down later to leave only the last PD
+                * in the stack.
+                */
+               if (!opt_pd_annotations)
+                       g_hash_table_insert(pd_ann_visible,
+                                           g_strdup(di->inst_id), NULL);
+
+               /* Any keys left in the options hash are probes, where the key
+                * is the probe name as specified in the decoder class, and the
+                * value is the probe number i.e. the order in which the PD's
+                * incoming samples are arranged. */
+               if (srd_inst_probe_set_all(di, pd_opthash) != SRD_OK) {
+                       ret = 1;
+                       goto err_out;
                }
-               g_datalist_set_data(&pd_ann_visible, optokens[0], dummy);
-               for (optok = optokens+1; *optok; optok++) {
-                       char probe[strlen(*optok)];
-                       int num;
-                       if (sscanf(*optok, "%[^=]=%d", probe, &num) == 2) {
-                               printf("Setting probe '%s' to %d\n", probe, num);
-                               srd_instance_set_probe(di, probe, num);
-                       } else {
-                               fprintf(stderr, "Error: Couldn't parse decoder "
-                                       "options correctly! Aborting.\n");
-                               /* FIXME: Better error handling. */
-                               exit(EXIT_FAILURE);
+               g_hash_table_destroy(pd_opthash);
+               pd_opthash = NULL;
+       }
+
+err_out:
+       g_strfreev(pdtokens);
+       if (pd_opthash)
+               g_hash_table_destroy(pd_opthash);
+       if (pd_name)
+               g_free(pd_name);
+
+       return ret;
+}
+
+int setup_pd_stack(void)
+{
+       struct srd_decoder_inst *di_from, *di_to;
+       int ret, i;
+       char **pds;
+
+       /* Set up the protocol decoder stack. */
+       pds = g_strsplit(opt_pds, ",", 0);
+       if (g_strv_length(pds) > 1) {
+               if (opt_pd_stack) {
+                       /* A stack setup was specified, use that. */
+                       g_strfreev(pds);
+                       pds = g_strsplit(opt_pd_stack, ",", 0);
+                       if (g_strv_length(pds) < 2) {
+                               g_strfreev(pds);
+                               g_critical("Specify at least two protocol decoders to stack.");
+                               return 1;
                        }
                }
-               g_strfreev(optokens);
 
-               /* TODO: Handle errors. */
+               if (!(di_from = srd_inst_find_by_id(pds[0]))) {
+                       g_critical("Cannot stack protocol decoder '%s': "
+                                       "instance not found.", pds[0]);
+                       return 1;
+               }
+               for (i = 1; pds[i]; i++) {
+                       if (!(di_to = srd_inst_find_by_id(pds[i]))) {
+                               g_critical("Cannot stack protocol decoder '%s': "
+                                               "instance not found.", pds[i]);
+                               return 1;
+                       }
+                       if ((ret = srd_inst_stack(di_from, di_to)) != SRD_OK)
+                               return 1;
+
+                       /* Don't show annotation from this PD. Only the last PD in
+                        * the stack will be left on the annotation list (unless
+                        * the annotation list was specifically provided).
+                        */
+                       if (!opt_pd_annotations)
+                               g_hash_table_remove(pd_ann_visible,
+                                                   di_from->inst_id);
+
+                       di_from = di_to;
+               }
        }
+       g_strfreev(pds);
 
-       g_strfreev(pdtokens);
+       return 0;
+}
+
+int setup_pd_annotations(void)
+{
+       GSList *l;
+       struct srd_decoder *dec;
+       int ann;
+       char **pds, **pdtok, **keyval, **ann_descr;
+
+       /* Set up custom list of PDs and annotations to show. */
+       if (opt_pd_annotations) {
+               pds = g_strsplit(opt_pd_annotations, ",", 0);
+               for (pdtok = pds; *pdtok && **pdtok; pdtok++) {
+                       ann = 0;
+                       keyval = g_strsplit(*pdtok, "=", 0);
+                       if (!(dec = srd_decoder_get_by_id(keyval[0]))) {
+                               g_critical("Protocol decoder '%s' not found.", keyval[0]);
+                               return 1;
+                       }
+                       if (!dec->annotations) {
+                               g_critical("Protocol decoder '%s' has no annotations.", keyval[0]);
+                               return 1;
+                       }
+                       if (g_strv_length(keyval) == 2) {
+                               for (l = dec->annotations; l; l = l->next, ann++) {
+                                       ann_descr = l->data;
+                                       if (!canon_cmp(ann_descr[0], keyval[1]))
+                                               /* Found it. */
+                                               break;
+                               }
+                               if (!l) {
+                                       g_critical("Annotation '%s' not found "
+                                                       "for protocol decoder '%s'.", keyval[1], keyval[0]);
+                                       return 1;
+                               }
+                       }
+                       g_debug("cli: showing protocol decoder annotation %d from '%s'", ann, keyval[0]);
+                       g_hash_table_insert(pd_ann_visible, g_strdup(keyval[0]), GINT_TO_POINTER(ann));
+                       g_strfreev(keyval);
+               }
+               g_strfreev(pds);
+       }
+
+       return 0;
+}
+
+int setup_output_format(void)
+{
+       GHashTable *fmtargs;
+       GHashTableIter iter;
+       gpointer key, value;
+       struct sr_output_format **outputs;
+       int i;
+       char *fmtspec;
+
+       if (!opt_output_format) {
+               opt_output_format = DEFAULT_OUTPUT_FORMAT;
+               /* we'll need to remember this so when saving to a file
+                * later, sigrok session format will be used.
+                */
+               default_output_format = TRUE;
+       }
+       fmtargs = parse_generic_arg(opt_output_format);
+       fmtspec = g_hash_table_lookup(fmtargs, "sigrok_key");
+       if (!fmtspec) {
+               g_critical("Invalid output format.");
+               return 1;
+       }
+       outputs = sr_output_list();
+       for (i = 0; outputs[i]; i++) {
+               if (strcmp(outputs[i]->id, fmtspec))
+                       continue;
+               g_hash_table_remove(fmtargs, "sigrok_key");
+               output_format = outputs[i];
+               g_hash_table_iter_init(&iter, fmtargs);
+               while (g_hash_table_iter_next(&iter, &key, &value)) {
+                       /* only supporting one parameter per output module
+                        * for now, and only its value */
+                       output_format_param = g_strdup(value);
+                       break;
+               }
+               break;
+       }
+       if (!output_format) {
+               g_critical("Invalid output format %s.", opt_output_format);
+               return 1;
+       }
+       g_hash_table_destroy(fmtargs);
 
        return 0;
 }
 
-void show_pd_annotation(struct srd_proto_data *pdata)
+void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data)
 {
        int i;
        char **annotations;
+       gpointer ann_format;
 
-       annotations = pdata->data;
-       if (pdata->ann_format != 0) {
-               /* CLI only shows the default annotation format */
+       /* 'cb_data' is not used in this specific callback. */
+       (void)cb_data;
+
+       if (!pd_ann_visible)
                return;
-       }
 
-       if (!g_datalist_get_data(&pd_ann_visible, pdata->pdo->proto_id)) {
-               /* not in the list of PDs whose annotations we're showing */
+       if (!g_hash_table_lookup_extended(pd_ann_visible, pdata->pdo->di->inst_id,
+                       NULL, &ann_format))
+               /* Not in the list of PDs whose annotations we're showing. */
                return;
-       }
 
+       if (pdata->ann_format != GPOINTER_TO_INT(ann_format))
+               /* We don't want this particular format from the PD. */
+               return;
+
+       annotations = pdata->data;
+       if (opt_loglevel > SR_LOG_WARN)
+               printf("%"PRIu64"-%"PRIu64" ", pdata->start_sample, pdata->end_sample);
        printf("%s: ", pdata->pdo->proto_id);
        for (i = 0; annotations[i]; i++)
                printf("\"%s\" ", annotations[i]);
        printf("\n");
-
 }
 
-static int select_probes(struct sr_device *device)
+static int select_probes(struct sr_dev *dev)
 {
        struct sr_probe *probe;
        char **probelist;
@@ -523,7 +841,7 @@ static int select_probes(struct sr_device *device)
         * This only works because a device by default initializes
         * and enables all its probes.
         */
-       max_probes = g_slist_length(device->probes);
+       max_probes = g_slist_length(dev->probes);
        probelist = parse_probestring(max_probes, opt_probes);
        if (!probelist) {
                return SR_ERR;
@@ -531,10 +849,10 @@ static int select_probes(struct sr_device *device)
 
        for (i = 0; i < max_probes; i++) {
                if (probelist[i]) {
-                       sr_device_probe_name(device, i + 1, probelist[i]);
+                       sr_dev_probe_name_set(dev, i + 1, probelist[i]);
                        g_free(probelist[i]);
                } else {
-                       probe = sr_device_probe_find(device, i + 1);
+                       probe = sr_dev_probe_find(dev, i + 1);
                        probe->enabled = FALSE;
                }
        }
@@ -564,8 +882,7 @@ static struct sr_input_format *determine_input_file_format(
        /* If there are no input formats, return NULL right away. */
        inputs = sr_input_list();
        if (!inputs) {
-               fprintf(stderr, "cli: %s: no supported input formats "
-                       "available", __func__);
+               g_critical("No supported input formats available.");
                return NULL;
        }
 
@@ -574,14 +891,14 @@ static struct sr_input_format *determine_input_file_format(
                for (i = 0; inputs[i]; i++) {
                        if (strcasecmp(inputs[i]->id, opt_input_format))
                                continue;
-                       printf("Using user-specified input file format"
-                              " '%s'.\n", inputs[i]->id);
+                       g_debug("Using user-specified input file format '%s'.",
+                                       inputs[i]->id);
                        return inputs[i];
                }
 
                /* The user specified an unknown input format, return NULL. */
-               fprintf(stderr, "Error: Specified input file format '%s' is "
-                       "unknown.\n", opt_input_format);
+               g_critical("Error: specified input file format '%s' is "
+                       "unknown.", opt_input_format);
                return NULL;
        }
 
@@ -593,11 +910,13 @@ static struct sr_input_format *determine_input_file_format(
 
        /* Return NULL if no input module wanted to touch this. */
        if (!inputs[i]) {
-               fprintf(stderr, "Error: No matching input module found.\n");
+               g_critical("Error: no matching input module found.");
                return NULL;
        }
+
+       g_debug("cli: Autodetected '%s' input format for file '%s'.",
+               inputs[i]->id, filename);
                
-       printf("Using input file format '%s'.\n", inputs[i]->id);
        return inputs[i];
 }
 
@@ -607,40 +926,38 @@ static void load_input_file_format(void)
        struct sr_input *in;
        struct sr_input_format *input_format;
 
-       input_format = determine_input_file_format(opt_input_file,
-                                                  opt_input_format);
-       if (!input_format) {
-               fprintf(stderr, "Error: Couldn't detect input file format.\n");
+       if (!(input_format = determine_input_file_format(opt_input_file,
+                                                  opt_input_format)))
+               /* The exact cause was already logged. */
                return;
-       }
 
        if (stat(opt_input_file, &st) == -1) {
-               printf("Failed to load %s: %s\n", opt_input_file,
+               g_critical("Failed to load %s: %s", opt_input_file,
                        strerror(errno));
                exit(1);
        }
 
        /* Initialize the input module. */
-       if (!(in = malloc(sizeof(struct sr_input)))) {
-               printf("Failed to allocate input module.\n");
+       if (!(in = g_try_malloc(sizeof(struct sr_input)))) {
+               g_critical("Failed to allocate input module.");
                exit(1);
        }
        in->format = input_format;
        in->param = input_format_param;
        if (in->format->init) {
                if (in->format->init(in) != SR_OK) {
-                       printf("Input format init failed.\n");
+                       g_critical("Input format init failed.");
                        exit(1);
                }
        }
 
-       if (select_probes(in->vdevice) > 0)
+       if (select_probes(in->vdev) > 0)
             return;
 
        sr_session_new();
        sr_session_datafeed_callback_add(datafeed_in);
-       if (sr_session_device_add(in->vdevice) != SR_OK) {
-               printf("Failed to use device.\n");
+       if (sr_session_dev_add(in->vdev) != SR_OK) {
+               g_critical("Failed to use device.");
                sr_session_destroy();
                return;
        }
@@ -648,10 +965,9 @@ static void load_input_file_format(void)
        input_format->loadfile(in, opt_input_file);
        if (opt_output_file && default_output_format) {
                if (sr_session_save(opt_output_file) != SR_OK)
-                       printf("Failed to save session.\n");
+                       g_critical("Failed to save session.");
        }
        sr_session_destroy();
-
 }
 
 static void load_input_file(void)
@@ -668,27 +984,26 @@ static void load_input_file(void)
                /* fall back on input modules */
                load_input_file_format();
        }
-
 }
 
-int num_real_devices(void)
+int num_real_devs(void)
 {
-       struct sr_device *device;
-       GSList *devices, *l;
-       int num_devices;
-
-       num_devices = 0;
-       devices = sr_device_list();
-       for (l = devices; l; l = l->next) {
-               device = l->data;
-               if (!strstr(device->plugin->name, "demo"))
-                       num_devices++;
+       struct sr_dev *dev;
+       GSList *devs, *l;
+       int num_devs;
+
+       num_devs = 0;
+       devs = sr_dev_list();
+       for (l = devs; l; l = l->next) {
+               dev = l->data;
+               if (!sr_dev_has_hwcap(dev, SR_HWCAP_DEMO_DEV))
+                       num_devs++;
        }
 
-       return num_devices;
+       return num_devs;
 }
 
-static int set_device_options(struct sr_device *device, GHashTable *args)
+static int set_dev_options(struct sr_dev *dev, GHashTable *args)
 {
        GHashTableIter iter;
        gpointer key, value;
@@ -700,12 +1015,12 @@ static int set_device_options(struct sr_device *device, GHashTable *args)
        g_hash_table_iter_init(&iter, args);
        while (g_hash_table_iter_next(&iter, &key, &value)) {
                found = FALSE;
-               for (i = 0; sr_hwcap_options[i].capability; i++) {
+               for (i = 0; sr_hwcap_options[i].hwcap; i++) {
                        if (strcmp(sr_hwcap_options[i].shortname, key))
                                continue;
                        if ((value == NULL) && 
                            (sr_hwcap_options[i].type != SR_T_BOOL)) {
-                               printf("Option '%s' needs a value.\n", (char *)key);
+                               g_critical("Option '%s' needs a value.", (char *)key);
                                return SR_ERR;
                        }
                        found = TRUE;
@@ -714,20 +1029,20 @@ static int set_device_options(struct sr_device *device, GHashTable *args)
                                ret = sr_parse_sizestring(value, &tmp_u64);
                                if (ret != SR_OK)
                                        break;
-                               ret = device->plugin-> set_configuration(device-> plugin_index,
-                                               sr_hwcap_options[i]. capability, &tmp_u64);
+                               ret = dev->driver->dev_config_set(dev->driver_index,
+                                       sr_hwcap_options[i].hwcap, &tmp_u64);
                                break;
                        case SR_T_CHAR:
-                               ret = device->plugin-> set_configuration(device-> plugin_index,
-                                               sr_hwcap_options[i]. capability, value);
+                               ret = dev->driver->dev_config_set(dev->driver_index,
+                                       sr_hwcap_options[i].hwcap, value);
                                break;
                        case SR_T_BOOL:
                                if (!value)
                                        tmp_bool = TRUE;
                                else 
                                        tmp_bool = sr_parse_boolstring(value);
-                               ret = device->plugin-> set_configuration(device-> plugin_index,
-                                               sr_hwcap_options[i]. capability
+                               ret = dev->driver->dev_config_set(dev->driver_index,
+                                               sr_hwcap_options[i].hwcap
                                                GINT_TO_POINTER(tmp_bool));
                                break;
                        default:
@@ -735,14 +1050,14 @@ static int set_device_options(struct sr_device *device, GHashTable *args)
                        }
 
                        if (ret != SR_OK) {
-                               printf("Failed to set device option '%s'.\n", (char *)key);
+                               g_critical("Failed to set device option '%s'.", (char *)key);
                                return ret;
                        }
                        else
                                break;
                }
                if (!found) {
-                       printf("Unknown device option '%s'.\n", (char *) key);
+                       g_critical("Unknown device option '%s'.", (char *) key);
                        return SR_ERR;
                }
        }
@@ -752,33 +1067,33 @@ static int set_device_options(struct sr_device *device, GHashTable *args)
 
 static void run_session(void)
 {
-       struct sr_device *device;
+       struct sr_dev *dev;
        GHashTable *devargs;
-       int num_devices, max_probes, *capabilities, i;
-       uint64_t tmp_u64, time_msec;
+       int num_devs, max_probes, i;
+       uint64_t time_msec;
        char **probelist, *devspec;
 
        devargs = NULL;
-       if (opt_device) {
-               devargs = parse_generic_arg(opt_device);
+       if (opt_dev) {
+               devargs = parse_generic_arg(opt_dev);
                devspec = g_hash_table_lookup(devargs, "sigrok_key");
-               device = parse_devicestring(devspec);
-               if (!device) {
-                       g_warning("Device not found.");
+               dev = parse_devstring(devspec);
+               if (!dev) {
+                       g_critical("Device not found.");
                        return;
                }
                g_hash_table_remove(devargs, "sigrok_key");
        } else {
-               num_devices = num_real_devices();
-               if (num_devices == 1) {
+               num_devs = num_real_devs();
+               if (num_devs == 1) {
                        /* No device specified, but there is only one. */
                        devargs = NULL;
-                       device = parse_devicestring("0");
-               } else if (num_devices == 0) {
-                       printf("No devices found.\n");
+                       dev = parse_devstring("0");
+               } else if (num_devs == 0) {
+                       g_critical("No devices found.");
                        return;
                } else {
-                       printf("%d devices found, please select one.\n", num_devices);
+                       g_critical("%d devices found, please select one.", num_devs);
                        return;
                }
        }
@@ -786,43 +1101,42 @@ static void run_session(void)
        sr_session_new();
        sr_session_datafeed_callback_add(datafeed_in);
 
-       if (sr_session_device_add(device) != SR_OK) {
-               printf("Failed to use device.\n");
+       if (sr_session_dev_add(dev) != SR_OK) {
+               g_critical("Failed to use device.");
                sr_session_destroy();
                return;
        }
 
        if (devargs) {
-               if (set_device_options(device, devargs) != SR_OK) {
+               if (set_dev_options(dev, devargs) != SR_OK) {
                        sr_session_destroy();
                        return;
                }
                g_hash_table_destroy(devargs);
        }
 
-       if (select_probes(device) != SR_OK)
+       if (select_probes(dev) != SR_OK)
             return;
 
        if (opt_continuous) {
-               capabilities = device->plugin->get_capabilities();
-               if (!sr_find_hwcap(capabilities, SR_HWCAP_CONTINUOUS)) {
-                       printf("This device does not support continuous sampling.");
+               if (!sr_driver_hwcap_exists(dev->driver, SR_HWCAP_CONTINUOUS)) {
+                       g_critical("This device does not support continuous sampling.");
                        sr_session_destroy();
                        return;
                }
        }
 
        if (opt_triggers) {
-               probelist = sr_parse_triggerstring(device, opt_triggers);
+               probelist = sr_parse_triggerstring(dev, opt_triggers);
                if (!probelist) {
                        sr_session_destroy();
                        return;
                }
 
-               max_probes = g_slist_length(device->probes);
+               max_probes = g_slist_length(dev->probes);
                for (i = 0; i < max_probes; i++) {
                        if (probelist[i]) {
-                               sr_device_trigger_set(device, i + 1, probelist[i]);
+                               sr_dev_trigger_set(dev, i + 1, probelist[i]);
                                g_free(probelist[i]);
                        }
                }
@@ -832,16 +1146,15 @@ static void run_session(void)
        if (opt_time) {
                time_msec = sr_parse_timestring(opt_time);
                if (time_msec == 0) {
-                       printf("Invalid time '%s'\n", opt_time);
+                       g_critical("Invalid time '%s'", opt_time);
                        sr_session_destroy();
                        return;
                }
 
-               capabilities = device->plugin->get_capabilities();
-               if (sr_find_hwcap(capabilities, SR_HWCAP_LIMIT_MSEC)) {
-                       if (device->plugin->set_configuration(device->plugin_index,
-                                                         SR_HWCAP_LIMIT_MSEC, &time_msec) != SR_OK) {
-                               printf("Failed to configure time limit.\n");
+               if (sr_driver_hwcap_exists(dev->driver, SR_HWCAP_LIMIT_MSEC)) {
+                       if (dev->driver->dev_config_set(dev->driver_index,
+                           SR_HWCAP_LIMIT_MSEC, &time_msec) != SR_OK) {
+                               g_critical("Failed to configure time limit.");
                                sr_session_destroy();
                                return;
                        }
@@ -851,20 +1164,22 @@ static void run_session(void)
                         * convert to samples based on the samplerate.
                         */
                        limit_samples = 0;
-                       if (sr_device_has_hwcap(device, SR_HWCAP_SAMPLERATE)) {
-                               tmp_u64 = *((uint64_t *) device->plugin->get_device_info(
-                                               device->plugin_index, SR_DI_CUR_SAMPLERATE));
-                               limit_samples = tmp_u64 * time_msec / (uint64_t) 1000;
+                       if (sr_dev_has_hwcap(dev, SR_HWCAP_SAMPLERATE)) {
+                               const uint64_t *samplerate;
+
+                               sr_dev_info_get(dev, SR_DI_CUR_SAMPLERATE,
+                                               (const void **)&samplerate);
+                               limit_samples = (*samplerate) * time_msec / (uint64_t)1000;
                        }
                        if (limit_samples == 0) {
-                               printf("Not enough time at this samplerate.\n");
+                               g_critical("Not enough time at this samplerate.");
                                sr_session_destroy();
                                return;
                        }
 
-                       if (device->plugin->set_configuration(device->plugin_index,
-                                                 SR_HWCAP_LIMIT_SAMPLES, &limit_samples) != SR_OK) {
-                               printf("Failed to configure time-based sample limit.\n");
+                       if (dev->driver->dev_config_set(dev->driver_index,
+                           SR_HWCAP_LIMIT_SAMPLES, &limit_samples) != SR_OK) {
+                               g_critical("Failed to configure time-based sample limit.");
                                sr_session_destroy();
                                return;
                        }
@@ -873,23 +1188,33 @@ static void run_session(void)
 
        if (opt_samples) {
                if ((sr_parse_sizestring(opt_samples, &limit_samples) != SR_OK)
-                       || (device->plugin->set_configuration(device->plugin_index,
-                                       SR_HWCAP_LIMIT_SAMPLES, &limit_samples) != SR_OK)) {
-                       printf("Failed to configure sample limit.\n");
+                       || (dev->driver->dev_config_set(dev->driver_index,
+                           SR_HWCAP_LIMIT_SAMPLES, &limit_samples) != SR_OK)) {
+                       g_critical("Failed to configure sample limit.");
+                       sr_session_destroy();
+                       return;
+               }
+       }
+
+       if (opt_frames) {
+               if ((sr_parse_sizestring(opt_frames, &limit_frames) != SR_OK)
+                       || (dev->driver->dev_config_set(dev->driver_index,
+                           SR_HWCAP_LIMIT_FRAMES, &limit_frames) != SR_OK)) {
+                       printf("Failed to configure frame limit.\n");
                        sr_session_destroy();
                        return;
                }
        }
 
-       if (device->plugin->set_configuration(device->plugin_index,
-                 SR_HWCAP_PROBECONFIG, (char *)device->probes) != SR_OK) {
-               printf("Failed to configure probes.\n");
+       if (dev->driver->dev_config_set(dev->driver_index,
+                 SR_HWCAP_PROBECONFIG, (char *)dev->probes) != SR_OK) {
+               g_critical("Failed to configure probes.");
                sr_session_destroy();
                return;
        }
 
        if (sr_session_start() != SR_OK) {
-               printf("Failed to start session.\n");
+               g_critical("Failed to start session.");
                sr_session_destroy();
                return;
        }
@@ -904,32 +1229,26 @@ static void run_session(void)
 
        if (opt_output_file && default_output_format) {
                if (sr_session_save(opt_output_file) != SR_OK)
-                       printf("Failed to save session.\n");
+                       g_critical("Failed to save session.");
        }
        sr_session_destroy();
-
 }
 
 static void logger(const gchar *log_domain, GLogLevelFlags log_level,
-                  const gchar *message, gpointer user_data)
+                  const gchar *message, gpointer cb_data)
 {
        /* Avoid compiler warnings. */
        (void)log_domain;
-       (void)user_data;
+       (void)cb_data;
 
        /*
         * All messages, warnings, errors etc. go to stderr (not stdout) in
         * order to not mess up the CLI tool data output, e.g. VCD output.
         */
-       if (log_level & (G_LOG_LEVEL_ERROR | G_LOG_LEVEL_WARNING)) {
+       if (log_level & (G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING)
+                       || opt_loglevel > SR_LOG_WARN) {
                fprintf(stderr, "%s\n", message);
                fflush(stderr);
-       } else {
-               if ((log_level & G_LOG_LEVEL_MESSAGE && debug == 1)
-                   || debug == 2) {
-                       printf("%s\n", message);
-                       fflush(stderr);
-               }
        }
 }
 
@@ -937,132 +1256,58 @@ int main(int argc, char **argv)
 {
        GOptionContext *context;
        GError *error;
-       GHashTable *fmtargs;
-       GHashTableIter iter;
-       gpointer key, value;
-       struct sr_output_format **outputs;
-       struct srd_decoder_instance *di_from, *di_to;
-       int i, ret;
-       char *fmtspec, **pds;
 
        g_log_set_default_handler(logger, NULL);
-       if (getenv("SIGROK_DEBUG"))
-               debug = strtol(getenv("SIGROK_DEBUG"), NULL, 10);
 
        error = NULL;
        context = g_option_context_new(NULL);
        g_option_context_add_main_entries(context, optargs, NULL);
 
        if (!g_option_context_parse(context, &argc, &argv, &error)) {
-               g_warning("%s", error->message);
+               g_critical("%s", error->message);
                return 1;
        }
 
        /* Set the loglevel (amount of messages to output) for libsigrok. */
-       if (sr_set_loglevel(opt_loglevel) != SR_OK) {
-               fprintf(stderr, "cli: %s: sr_set_loglevel(%d) failed\n",
-                       __func__, opt_loglevel);
+       if (sr_log_loglevel_set(opt_loglevel) != SR_OK)
                return 1;
-       }
 
        /* Set the loglevel (amount of messages to output) for libsigrokdecode. */
-       if (srd_set_loglevel(opt_loglevel) != SRD_OK) {
-               fprintf(stderr, "cli: %s: srd_set_loglevel(%d) failed\n",
-                       __func__, opt_loglevel);
+       if (srd_log_loglevel_set(opt_loglevel) != SRD_OK)
                return 1;
-       }
 
        if (sr_init() != SR_OK)
                return 1;
 
        if (opt_pds) {
-               if (srd_init() != SRD_OK) {
-                       printf("Failed to initialize sigrokdecode\n");
+               if (srd_init(NULL) != SRD_OK)
                        return 1;
-               }
-               if (register_pds(NULL, opt_pds) != 0) {
-                       printf("Failed to register protocol decoders\n");
+               if (register_pds(NULL, opt_pds) != 0)
                        return 1;
-               }
-               if (srd_register_callback(SRD_OUTPUT_ANN,
-                               show_pd_annotation) != SRD_OK) {
-                       printf("Failed to register protocol decoder callback\n");
+               if (srd_pd_output_callback_add(SRD_OUTPUT_ANN,
+                               show_pd_annotations, NULL) != SRD_OK)
                        return 1;
-               }
-       }
-
-       if (opt_pd_stack) {
-               pds = g_strsplit(opt_pd_stack, ":", 0);
-               if (g_strv_length(pds) < 2) {
-                       printf("Specify at least two protocol decoders to stack.\n");
+               if (setup_pd_stack() != 0)
                        return 1;
-               }
-
-               if (!(di_from = srd_instance_find(pds[0]))) {
-                       printf("Cannot stack protocol decoder '%s': instance not found.\n", pds[0]);
+               if (setup_pd_annotations() != 0)
                        return 1;
-               }
-               for (i = 1; pds[i]; i++) {
-                       if (!(di_to = srd_instance_find(pds[i]))) {
-                               printf("Cannot stack protocol decoder '%s': instance not found.\n", pds[i]);
-                               return 1;
-                       }
-                       if ((ret = srd_instance_stack(di_from, di_to) != SRD_OK))
-                               return ret;
-
-                       /* Don't show annotation from this PD. Only the last PD in
-                        * the stack will be left on the annotation list.
-                        */
-                       g_datalist_remove_data(&pd_ann_visible, di_from->instance_id);
-
-                       di_from = di_to;
-               }
-               g_strfreev(pds);
        }
 
-       if (!opt_format) {
-               opt_format = DEFAULT_OUTPUT_FORMAT;
-               /* we'll need to remember this so when saving to a file
-                * later, sigrok session format will be used.
-                */
-               default_output_format = TRUE;
-       }
-       fmtargs = parse_generic_arg(opt_format);
-       fmtspec = g_hash_table_lookup(fmtargs, "sigrok_key");
-       if (!fmtspec) {
-               printf("Invalid output format.\n");
+       if (setup_output_format() != 0)
                return 1;
-       }
-       outputs = sr_output_list();
-       for (i = 0; outputs[i]; i++) {
-               if (strcmp(outputs[i]->id, fmtspec))
-                       continue;
-               g_hash_table_remove(fmtargs, "sigrok_key");
-               output_format = outputs[i];
-               g_hash_table_iter_init(&iter, fmtargs);
-               while (g_hash_table_iter_next(&iter, &key, &value)) {
-                       /* only supporting one parameter per output module
-                        * for now, and only its value */
-                       output_format_param = g_strdup(value);
-                       break;
-               }
-               break;
-       }
-       if (!output_format) {
-               printf("invalid output format %s\n", opt_format);
-               return 1;
-       }
 
        if (opt_version)
                show_version();
-       else if (opt_list_devices)
-               show_device_list();
+       else if (opt_list_devs)
+               show_dev_list();
        else if (opt_input_file)
                load_input_file();
-       else if (opt_samples || opt_time || opt_continuous)
+       else if (opt_samples || opt_time || opt_frames || opt_continuous)
                run_session();
-       else if (opt_device)
-               show_device_detail();
+       else if (opt_dev)
+               show_dev_detail();
+       else if (opt_pds)
+               show_pd_detail();
        else
                printf("%s", g_option_context_get_help(context, TRUE, NULL));
 
@@ -1070,7 +1315,6 @@ int main(int argc, char **argv)
                srd_exit();
 
        g_option_context_free(context);
-       g_hash_table_destroy(fmtargs);
        sr_exit();
 
        return 0;