Deprecate SR_DI_HWCAPS.
[sigrok-cli.git] / sigrok-cli.c
index b39dcf6b92225525015548a6cd1a8b9505b5c8aa..6feabd4df3838e281dda077a76007537f2976a7f 100644 (file)
@@ -36,8 +36,7 @@
 
 #define DEFAULT_OUTPUT_FORMAT "bits:width=64"
 
-extern struct sr_hwcap_option sr_drvopts[];
-extern struct sr_hwcap_option sr_hwcap_options[];
+static struct sr_context *sr_ctx = NULL;
 
 static uint64_t limit_samples = 0;
 static uint64_t limit_frames = 0;
@@ -45,6 +44,7 @@ static struct sr_output_format *output_format = NULL;
 static int default_output_format = FALSE;
 static char *output_format_param = NULL;
 static GHashTable *pd_ann_visible = NULL;
+static GByteArray *savebuf;
 
 static gboolean opt_version = FALSE;
 static gint opt_loglevel = SR_LOG_WARN; /* Show errors+warnings per default. */
@@ -112,11 +112,11 @@ static GOptionEntry optargs[] = {
 };
 
 
-/* Convert driver options hash to GSList of struct sr_hwopt. */
+/* Convert driver options hash to GSList of struct sr_config. */
 static GSList *hash_to_hwopt(GHashTable *hash)
 {
-       struct sr_hwcap_option *ho;
-       struct sr_hwopt *hwopt;
+       const struct sr_config_info *srci;
+       struct sr_config *src;
        GList *gl, *keys;
        GSList *opts;
        char *key, *value;
@@ -125,26 +125,27 @@ static GSList *hash_to_hwopt(GHashTable *hash)
        opts = NULL;
        for (gl = keys; gl; gl = gl->next) {
                key = gl->data;
-               for (ho = sr_drvopts; ho->shortname; ho++) {
-                       if (!strcmp(key, ho->shortname)) {
-                               hwopt = g_try_malloc(sizeof(struct sr_hwopt));
-                               hwopt->hwopt = ho->hwcap;
-                               value = g_hash_table_lookup(hash, key);
-                               hwopt->value = g_strdup(value);
-                               opts = g_slist_append(opts, hwopt);
-                               break;
-                       }
-               }
-               if (!ho->shortname) {
+               if (!(srci = sr_config_info_name_get(key))) {
                        g_critical("Unknown option %s", key);
                        return NULL;
                }
+               src = g_try_malloc(sizeof(struct sr_config));
+               src->key = srci->key;
+               value = g_hash_table_lookup(hash, key);
+               src->value = g_strdup(value);
+               opts = g_slist_append(opts, src);
        }
        g_list_free(keys);
 
        return opts;
 }
 
+static void free_drvopts(struct sr_config *src)
+{
+       g_free((void *)src->value);
+       g_free(src);
+}
+
 static GSList *device_scan(void)
 {
        struct sr_dev_driver **drivers, *driver;
@@ -169,7 +170,7 @@ static GSList *device_scan(void)
                        return NULL;
                }
                g_free(drvname);
-               if (sr_driver_init(driver) != SR_OK) {
+               if (sr_driver_init(sr_ctx, driver) != SR_OK) {
                        g_critical("Failed to initialize driver.");
                        return NULL;
                }
@@ -179,13 +180,14 @@ static GSList *device_scan(void)
                                /* Unknown options, already logged. */
                                return NULL;
                devices = sr_driver_scan(driver, drvopts);
+               g_slist_free_full(drvopts, (GDestroyNotify)free_drvopts);
        } else {
                /* No driver specified, let them all scan on their own. */
                devices = NULL;
                drivers = sr_driver_list();
                for (i = 0; drivers[i]; i++) {
                        driver = drivers[i];
-                       if (sr_driver_init(driver) != SR_OK) {
+                       if (sr_driver_init(sr_ctx, driver) != SR_OK) {
                                g_critical("Failed to initialize driver.");
                                return NULL;
                        }
@@ -201,7 +203,7 @@ static GSList *device_scan(void)
 
 static void show_version(void)
 {
-       GSList *l;
+       const GSList *l;
        struct sr_dev_driver **drivers;
        struct sr_input_format **inputs;
        struct sr_output_format **outputs;
@@ -251,6 +253,8 @@ static void show_version(void)
 
 static void print_dev_line(const struct sr_dev_inst *sdi)
 {
+       struct sr_probe *probe;
+       GSList *l;
 
        if (sdi->vendor && sdi->vendor[0])
                printf("%s ", sdi->vendor);
@@ -258,8 +262,18 @@ static void print_dev_line(const struct sr_dev_inst *sdi)
                printf("%s ", sdi->model);
        if (sdi->version && sdi->version[0])
                printf("%s ", sdi->version);
-       if (sdi->probes)
-               printf("with %d probes", g_slist_length(sdi->probes));
+       if (sdi->probes) {
+               if (g_slist_length(sdi->probes) == 1) {
+                       probe = sdi->probes->data;
+                       printf("with 1 probe: %s", probe->name);
+               } else {
+                       printf("with %d probes:", g_slist_length(sdi->probes));
+                       for (l = sdi->probes; l; l = l->next) {
+                               probe = l->data;
+                               printf(" %s", probe->name);
+                       }
+               }
+       }
        printf("\n");
 }
 
@@ -283,7 +297,7 @@ static void show_dev_list(void)
 static void show_dev_detail(void)
 {
        struct sr_dev_inst *sdi;
-       const struct sr_hwcap_option *hwo;
+       const struct sr_config_info *srci;
        const struct sr_samplerates *samplerates;
        struct sr_rational *rationals;
        GSList *devices;
@@ -318,7 +332,7 @@ static void show_dev_detail(void)
 
        print_dev_line(sdi);
 
-       if (sr_info_get(sdi->driver, SR_DI_TRIGGER_TYPES, (const void **)&charopts,
+       if (sr_config_list(sdi->driver, SR_CONF_TRIGGER_TYPE, (const void **)&charopts,
                        sdi) == SR_OK && charopts) {
                printf("Supported triggers: ");
                while (*charopts) {
@@ -332,20 +346,20 @@ static void show_dev_detail(void)
                        NULL) == SR_OK) && hwopts) {
                printf("Supported driver options:\n");
                for (i = 0; hwopts[i]; i++) {
-                       if (!(hwo = sr_drvopt_get(hwopts[i])))
+                       if (!(srci = sr_config_info_get(hwopts[i])))
                                continue;
-                       printf("    %s\n", hwo->shortname);
+                       printf("    %s\n", srci->id);
                }
        }
 
        title = "Supported device options:\n";
-       if ((sr_info_get(sdi->driver, SR_DI_HWCAPS, (const void **)&hwcaps,
+       if ((sr_config_list(sdi->driver, SR_CONF_DEVICE_OPTIONS, (const void **)&hwcaps,
                        NULL) != SR_OK) || !hwcaps)
                /* Driver supports no device instance options. */
                return;
 
        for (cap = 0; hwcaps[cap]; cap++) {
-               if (!(hwo = sr_hw_hwcap_get(hwcaps[cap])))
+               if (!(srci = sr_config_info_get(hwcaps[cap])))
                        continue;
 
                if (title) {
@@ -353,10 +367,10 @@ static void show_dev_detail(void)
                        title = NULL;
                }
 
-               if (hwo->hwcap == SR_HWCAP_PATTERN_MODE) {
+               if (srci->key == SR_CONF_PATTERN_MODE) {
                        /* Pattern generator modes */
-                       printf("    %s", hwo->shortname);
-                       if (sr_info_get(sdi->driver, SR_DI_PATTERNS,
+                       printf("    %s", srci->id);
+                       if (sr_config_list(sdi->driver, SR_CONF_PATTERN_MODE,
                                        (const void **)&stropts, sdi) == SR_OK) {
                                printf(" - supported patterns:\n");
                                for (i = 0; stropts[i]; i++)
@@ -365,10 +379,10 @@ static void show_dev_detail(void)
                                printf("\n");
                        }
 
-               } else if (hwo->hwcap == SR_HWCAP_SAMPLERATE) {
+               } else if (srci->key == SR_CONF_SAMPLERATE) {
                        /* Supported samplerates */
-                       printf("    %s", hwo->shortname);
-                       if (sr_info_get(sdi->driver, SR_DI_SAMPLERATES,
+                       printf("    %s", srci->id);
+                       if (sr_config_list(sdi->driver, SR_CONF_SAMPLERATE,
                                        (const void **)&samplerates, sdi) != SR_OK) {
                                printf("\n");
                                continue;
@@ -395,10 +409,10 @@ static void show_dev_detail(void)
                                        printf("      %s\n", sr_samplerate_string(samplerates->list[i]));
                        }
 
-               } else if (hwo->hwcap == SR_HWCAP_BUFFERSIZE) {
+               } else if (srci->key == SR_CONF_BUFFERSIZE) {
                        /* Supported buffer sizes */
-                       printf("    %s", hwo->shortname);
-                       if (sr_info_get(sdi->driver, SR_DI_BUFFERSIZES,
+                       printf("    %s", srci->id);
+                       if (sr_config_list(sdi->driver, SR_CONF_BUFFERSIZE,
                                        (const void **)&integers, sdi) != SR_OK) {
                                printf("\n");
                                continue;
@@ -407,10 +421,10 @@ static void show_dev_detail(void)
                        for (i = 0; integers[i]; i++)
                                printf("      %"PRIu64"\n", integers[i]);
 
-               } else if (hwo->hwcap == SR_HWCAP_TIMEBASE) {
+               } else if (srci->key == SR_CONF_TIMEBASE) {
                        /* Supported time bases */
-                       printf("    %s", hwo->shortname);
-                       if (sr_info_get(sdi->driver, SR_DI_TIMEBASES,
+                       printf("    %s", srci->id);
+                       if (sr_config_list(sdi->driver, SR_CONF_TIMEBASE,
                                        (const void **)&rationals, sdi) != SR_OK) {
                                printf("\n");
                                continue;
@@ -420,10 +434,10 @@ static void show_dev_detail(void)
                                printf("      %s\n", sr_period_string(
                                                rationals[i].p * rationals[i].q));
 
-               } else if (hwo->hwcap == SR_HWCAP_TRIGGER_SOURCE) {
+               } else if (srci->key == SR_CONF_TRIGGER_SOURCE) {
                        /* Supported trigger sources */
-                       printf("    %s", hwo->shortname);
-                       if (sr_info_get(sdi->driver, SR_DI_TRIGGER_SOURCES,
+                       printf("    %s", srci->id);
+                       if (sr_config_list(sdi->driver, SR_CONF_TRIGGER_SOURCE,
                                        (const void **)&stropts, sdi) != SR_OK) {
                                printf("\n");
                                continue;
@@ -432,10 +446,10 @@ static void show_dev_detail(void)
                        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_info_get(sdi->driver, SR_DI_FILTERS,
+               } else if (srci->key == SR_CONF_FILTER) {
+                       /* Supported filters */
+                       printf("    %s", srci->id);
+                       if (sr_config_list(sdi->driver, SR_CONF_FILTER,
                                        (const void **)&stropts, sdi) != SR_OK) {
                                printf("\n");
                                continue;
@@ -444,10 +458,10 @@ static void show_dev_detail(void)
                        for (i = 0; stropts[i]; i++)
                                printf("      %s\n", stropts[i]);
 
-               } else if (hwo->hwcap == SR_HWCAP_VDIV) {
+               } else if (srci->key == SR_CONF_VDIV) {
                        /* Supported volts/div values */
-                       printf("    %s", hwo->shortname);
-                       if (sr_info_get(sdi->driver, SR_DI_VDIVS,
+                       printf("    %s", srci->id);
+                       if (sr_config_list(sdi->driver, SR_CONF_VDIV,
                                        (const void **)&rationals, sdi) != SR_OK) {
                                printf("\n");
                                continue;
@@ -456,10 +470,10 @@ static void show_dev_detail(void)
                        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) {
+               } else if (srci->key == SR_CONF_COUPLING) {
                        /* Supported coupling settings */
-                       printf("    %s", hwo->shortname);
-                       if (sr_info_get(sdi->driver, SR_DI_COUPLING,
+                       printf("    %s", srci->id);
+                       if (sr_config_list(sdi->driver, SR_CONF_COUPLING,
                                        (const void **)&stropts, sdi) != SR_OK) {
                                printf("\n");
                                continue;
@@ -470,7 +484,7 @@ static void show_dev_detail(void)
 
                } else {
                        /* Everything else */
-                       printf("    %s\n", hwo->shortname);
+                       printf("    %s\n", srci->id);
                }
        }
 
@@ -486,7 +500,7 @@ static void show_pd_detail(void)
        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);
+                       g_critical("Protocol decoder %s not found.", *pdtok);
                        return;
                }
                printf("ID: %s\nName: %s\nLong name: %s\nDescription: %s\n",
@@ -532,25 +546,43 @@ static void show_pd_detail(void)
        g_strfreev(pdtokens);
 }
 
-static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet)
+static GArray *get_enabled_logic_probes(const struct sr_dev_inst *sdi)
+{
+       struct sr_probe *probe;
+       GArray *probes;
+       GSList *l;
+
+       probes = g_array_new(FALSE, FALSE, sizeof(int));
+       for (l = sdi->probes; l; l = l->next) {
+               probe = l->data;
+               if (probe->type != SR_PROBE_LOGIC)
+                       continue;
+               if (probe->enabled != TRUE)
+                       continue;
+               g_array_append_val(probes, probe->index);
+       }
+
+       return probes;
+}
+
+static void datafeed_in(const struct sr_dev_inst *sdi,
+               const struct sr_datafeed_packet *packet)
 {
+       const struct sr_datafeed_meta *meta;
+       const struct sr_datafeed_logic *logic;
+       const struct sr_datafeed_analog *analog;
+       struct sr_config *src;
        static struct sr_output *o = NULL;
-       static int logic_probelist[SR_MAX_NUM_PROBES] = { 0 };
-       static struct sr_probe *analog_probelist[SR_MAX_NUM_PROBES];
+       static GArray *logic_probelist = NULL;
        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_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;
+       int sample_size, ret;
+       uint64_t *samplerate, output_len, filter_out_len;
        uint8_t *output_buf, *filter_out;
+       GString *out;
+       GSList *l;
 
        /* If the first packet to come in isn't a header, don't even try. */
        if (packet->type != SR_DF_HEADER && o == NULL)
@@ -566,7 +598,7 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet)
                        exit(1);
                }
                o->format = output_format;
-               o->dev = dev;
+               o->sdi = (struct sr_dev_inst *)sdi;
                o->param = output_format_param;
                if (o->format->init) {
                        if (o->format->init(o) != SR_OK) {
@@ -574,6 +606,38 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet)
                                exit(1);
                        }
                }
+
+               /* Prepare non-stdout output. */
+               outfile = stdout;
+               if (opt_output_file) {
+                       if (default_output_format) {
+                               /* output file is in session format, so we'll
+                                * keep a copy of everything as it comes in
+                                * and save from there after the session. */
+                               outfile = NULL;
+                               savebuf = g_byte_array_new();
+                       } 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");
+                       }
+               }
+
+               /* Prepare for logic data. */
+               logic_probelist = get_enabled_logic_probes(sdi);
+               /* How many bytes we need to store the packed samples. */
+               unitsize = (logic_probelist->len + 7) / 8;
+
+               if (opt_pds && logic_probelist->len) {
+                       if (sr_info_get(sdi->driver, SR_CONF_SAMPLERATE,
+                                       (const void **)&samplerate, sdi) != SR_OK) {
+                               g_critical("Unable to initialize protocol "
+                                               "decoders: no samplerate found.");
+                               break;
+                       }
+                       srd_session_start(logic_probelist->len, unitsize,
+                                       *samplerate);
+               }
                break;
 
        case SR_DF_END:
@@ -597,13 +661,41 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet)
                if (opt_continuous)
                        g_warning("Device stopped after %" PRIu64 " samples.",
                               received_samples);
-               sr_session_stop();
+
                if (outfile && outfile != stdout)
                        fclose(outfile);
+
+               if (opt_output_file && default_output_format) {
+                       if (sr_session_save(opt_output_file, sdi, savebuf->data,
+                                       unitsize, savebuf->len / unitsize) != SR_OK)
+                               g_critical("Failed to save session.");
+                       g_byte_array_free(savebuf, FALSE);
+               }
+
+               g_array_free(logic_probelist, TRUE);
+               if (o->format->cleanup)
+                       o->format->cleanup(o);
                g_free(o);
                o = NULL;
                break;
 
+       case SR_DF_META:
+               g_debug("cli: received SR_DF_META");
+               meta = packet->payload;
+               for (l = meta->config; l; l = l->next) {
+                       src = l->data;
+                       switch (src->key) {
+                       case SR_CONF_SAMPLERATE:
+                               samplerate = (uint64_t *)src->value;
+                               g_debug("cli: got samplerate %"PRIu64, *samplerate);
+                               break;
+                       default:
+                               /* Unknown metadata is not an error. */
+                               break;
+                       }
+               }
+               break;
+
        case SR_DF_TRIGGER:
                g_debug("cli: received SR_DF_TRIGGER");
                if (o->format->event)
@@ -612,41 +704,6 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet)
                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);
@@ -662,12 +719,12 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet)
                        break;
 
                ret = sr_filter_probes(sample_size, unitsize, logic_probelist,
-                                          logic->data, logic->length,
-                                          &filter_out, &filter_out_len);
+                               logic->data, logic->length,
+                               &filter_out, &filter_out_len);
                if (ret != SR_OK)
                        break;
 
-               /* what comes out of the filter is guaranteed to be packed into the
+               /* 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.
@@ -676,64 +733,29 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet)
                                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_stop();
+               if (opt_output_file && default_output_format) {
+                       /* Saving to a session file. */
+                       g_byte_array_append(savebuf, filter_out, filter_out_len);
                } 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_buf) {
-                               fwrite(output_buf, 1, output_len, outfile);
-                               fflush(outfile);
-                               g_free(output_buf);
+                       if (opt_pds) {
+                               if (srd_session_send(received_samples, (uint8_t*)filter_out,
+                                               filter_out_len) != SRD_OK)
+                                       sr_session_stop();
+                       } 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_buf) {
+                                       fwrite(output_buf, 1, output_len, outfile);
+                                       fflush(outfile);
+                                       g_free(output_buf);
+                               }
                        }
                }
-
-               cleanup:
                g_free(filter_out);
-               received_samples += logic->length / sample_size;
-               break;
 
-       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_analog_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_analog_probes++] = probe;
-               }
-
-               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");
-                       }
-               }
+               received_samples += logic->length / sample_size;
                break;
 
        case SR_DF_ANALOG:
@@ -786,7 +808,15 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet)
                break;
 
        default:
-               g_message("received unknown packet type %d", packet->type);
+               break;
+       }
+
+       if (o && o->format->recv) {
+               out = o->format->recv(o, sdi, packet);
+               if (out && out->len) {
+                       fwrite(out->str, 1, out->len, outfile);
+                       fflush(outfile);
+               }
        }
 
 }
@@ -803,7 +833,6 @@ static int register_pds(struct sr_dev *dev, const char *pdstring)
        int ret;
        char **pdtokens, **pdtok, *pd_name;
 
-       /* Avoid compiler warnings. */
        (void)dev;
 
        ret = 0;
@@ -1042,35 +1071,25 @@ void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data)
        fflush(stdout);
 }
 
-static int select_probes(struct sr_dev *dev)
+static int select_probes(struct sr_dev_inst *sdi)
 {
        struct sr_probe *probe;
-       char **probelist;
-       int max_probes, i;
+       GSList *selected_probes, *l;
 
        if (!opt_probes)
                return SR_OK;
 
-       /*
-        * This only works because a device by default initializes
-        * and enables all its probes.
-        */
-       max_probes = g_slist_length(dev->probes);
-       probelist = parse_probestring(max_probes, opt_probes);
-       if (!probelist) {
+       if (!(selected_probes = parse_probestring(sdi, opt_probes)))
                return SR_ERR;
-       }
 
-       for (i = 0; i < max_probes; i++) {
-               if (probelist[i]) {
-                       sr_dev_probe_name_set(dev, i + 1, probelist[i]);
-                       g_free(probelist[i]);
-               } else {
-                       probe = sr_dev_probe_find(dev, i + 1);
+       for (l = sdi->probes; l; l = l->next) {
+               probe = l->data;
+               if (g_slist_find(selected_probes, probe))
+                       probe->enabled = TRUE;
+               else
                        probe->enabled = FALSE;
-               }
        }
-       g_free(probelist);
+       g_slist_free(selected_probes);
 
        return SR_OK;
 }
@@ -1143,7 +1162,7 @@ static void load_input_file_format(void)
        char *fmtspec = NULL;
 
        if (opt_input_format) {
-               fmtargs = parse_generic_arg(opt_input_format);
+               fmtargs = parse_generic_arg(opt_input_format, TRUE);
                fmtspec = g_hash_table_lookup(fmtargs, "sigrok_key");
        }
 
@@ -1152,7 +1171,7 @@ static void load_input_file_format(void)
                /* The exact cause was already logged. */
                return;
        }
-;
+
        if (fmtargs)
                g_hash_table_remove(fmtargs, "sigrok_key");
 
@@ -1176,22 +1195,19 @@ static void load_input_file_format(void)
                }
        }
 
-       if (select_probes(in->vdev) > 0)
-            return;
+       if (select_probes(in->sdi) > 0)
+               return;
 
        sr_session_new();
        sr_session_datafeed_callback_add(datafeed_in);
-       if (sr_session_dev_add(in->vdev) != SR_OK) {
+       if (sr_session_dev_add(in->sdi) != SR_OK) {
                g_critical("Failed to use device.");
                sr_session_destroy();
                return;
        }
 
        input_format->loadfile(in, opt_input_file);
-       if (opt_output_file && default_output_format) {
-               if (sr_session_save(opt_output_file) != SR_OK)
-                       g_critical("Failed to save session.");
-       }
+
        sr_session_destroy();
 
        if (fmtargs)
@@ -1214,80 +1230,115 @@ static void load_input_file(void)
        }
 }
 
-static int set_dev_options(struct sr_dev *dev, GHashTable *args)
+static int set_dev_options(struct sr_dev_inst *sdi, GHashTable *args)
 {
+       const struct sr_config_info *srci;
        GHashTableIter iter;
        gpointer key, value;
-       int ret, i;
+       int ret;
        float tmp_float;
        uint64_t tmp_u64;
        struct sr_rational tmp_rat;
        gboolean tmp_bool;
-       gboolean found;
+       void *val;
 
        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].hwcap; i++) {
-                       if (strcmp(sr_hwcap_options[i].shortname, key))
-                               continue;
-                       if ((value == NULL) && 
-                           (sr_hwcap_options[i].type != SR_T_BOOL)) {
-                               g_critical("Option '%s' needs a value.", (char *)key);
-                               return SR_ERR;
-                       }
-                       found = TRUE;
-                       switch (sr_hwcap_options[i].type) {
-                       case SR_T_UINT64:
-                               ret = sr_parse_sizestring(value, &tmp_u64);
-                               if (ret != SR_OK)
-                                       break;
-                               ret = dev->driver->dev_config_set(dev->driver_index,
-                                       sr_hwcap_options[i].hwcap, &tmp_u64);
-                               break;
-                       case SR_T_CHAR:
-                               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 = dev->driver->dev_config_set(dev->driver_index,
-                                               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);
+               if (!(srci = sr_config_info_name_get(key))) {
+                       g_critical("Unknown device option '%s'.", (char *) key);
+                       return SR_ERR;
+               }
+
+               if ((value == NULL) &&
+                       (srci->datatype != SR_T_BOOL)) {
+                       g_critical("Option '%s' needs a value.", (char *)key);
+                       return SR_ERR;
+               }
+               val = NULL;
+               switch (srci->datatype) {
+               case SR_T_UINT64:
+                       ret = sr_parse_sizestring(value, &tmp_u64);
+                       if (ret != SR_OK)
                                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);
+                       val = &tmp_u64;
+                       break;
+               case SR_T_CHAR:
+                       val = value;
+                       break;
+               case SR_T_BOOL:
+                       if (!value)
+                               tmp_bool = TRUE;
+                       else
+                               tmp_bool = sr_parse_boolstring(value);
+                       val = &tmp_bool;
+                       break;
+               case SR_T_FLOAT:
+                       tmp_float = strtof(value, NULL);
+                       val = &tmp_float;
+                       break;
+               case SR_T_RATIONAL_PERIOD:
+                       if ((ret = sr_parse_period(value, &tmp_rat)) != SR_OK)
                                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);
+                       val = &tmp_rat;
+                       break;
+               case SR_T_RATIONAL_VOLT:
+                       if ((ret = sr_parse_voltage(value, &tmp_rat)) != SR_OK)
                                break;
-                       default:
-                               ret = SR_ERR;
-                       }
+                       val = &tmp_rat;
+                       break;
+               default:
+                       ret = SR_ERR;
+               }
+               if (val)
+                       ret = sr_dev_config_set(sdi, srci->key, val);
+               if (ret != SR_OK) {
+                       g_critical("Failed to set device option '%s'.", (char *)key);
+                       return ret;
+               }
+       }
 
-                       if (ret != SR_OK) {
-                               g_critical("Failed to set device option '%s'.", (char *)key);
-                               return ret;
-                       }
-                       else
-                               break;
+       return SR_OK;
+}
+
+static int set_limit_time(const struct sr_dev_inst *sdi)
+{
+       uint64_t time_msec;
+       uint64_t *samplerate;
+
+       time_msec = sr_parse_timestring(opt_time);
+       if (time_msec == 0) {
+               g_critical("Invalid time '%s'", opt_time);
+               sr_session_destroy();
+               return SR_ERR;
+       }
+
+       if (sr_driver_hwcap_exists(sdi->driver, SR_CONF_LIMIT_MSEC)) {
+               if (sr_dev_config_set(sdi, SR_CONF_LIMIT_MSEC, &time_msec) != SR_OK) {
+                       g_critical("Failed to configure time limit.");
+                       sr_session_destroy();
+                       return SR_ERR;
                }
-               if (!found) {
-                       g_critical("Unknown device option '%s'.", (char *) key);
+       }
+       else {
+               /* time limit set, but device doesn't support this...
+                * convert to samples based on the samplerate.
+                */
+               limit_samples = 0;
+               if (sr_dev_has_hwcap(sdi, SR_CONF_SAMPLERATE)) {
+                       sr_info_get(sdi->driver, SR_CONF_SAMPLERATE,
+                                       (const void **)&samplerate, sdi);
+                       limit_samples = (*samplerate) * time_msec / (uint64_t)1000;
+               }
+               if (limit_samples == 0) {
+                       g_critical("Not enough time at this samplerate.");
+                       sr_session_destroy();
+                       return SR_ERR;
+               }
+
+               if (sr_dev_config_set(sdi, SR_CONF_LIMIT_SAMPLES,
+                                       &limit_samples) != SR_OK) {
+                       g_critical("Failed to configure time-based sample limit.");
+                       sr_session_destroy();
                        return SR_ERR;
                }
        }
@@ -1297,129 +1348,80 @@ static int set_dev_options(struct sr_dev *dev, GHashTable *args)
 
 static void run_session(void)
 {
-       struct sr_dev *dev;
+       GSList *devices;
        GHashTable *devargs;
-       int num_devs, max_probes, i;
-       uint64_t time_msec;
-       char **probelist, *devspec;
+       struct sr_dev_inst *sdi;
+       int max_probes, i;
+       char **triggerlist;
 
-       devargs = NULL;
-       if (opt_dev) {
-               devargs = parse_generic_arg(opt_dev);
-               devspec = g_hash_table_lookup(devargs, "sigrok_key");
-               dev = parse_devstring(devspec);
-               if (!dev) {
-                       g_critical("Device not found.");
-                       return;
-               }
-               g_hash_table_remove(devargs, "sigrok_key");
-       } else {
-               num_devs = num_real_devs();
-               if (num_devs == 1) {
-                       /* No device specified, but there is only one. */
-                       devargs = NULL;
-                       dev = parse_devstring("0");
-               } else if (num_devs == 0) {
-                       g_critical("No devices found.");
-                       return;
-               } else {
-                       g_critical("%d devices found, please select one.", num_devs);
-                       return;
-               }
+       devices = device_scan();
+       if (!devices) {
+               g_critical("No devices found.");
+               return;
+       }
+       if (g_slist_length(devices) > 1) {
+               g_critical("sigrok-cli only supports one device for capturing.");
+               return;
        }
+       sdi = devices->data;
 
        sr_session_new();
        sr_session_datafeed_callback_add(datafeed_in);
 
-       if (sr_session_dev_add(dev) != SR_OK) {
+       if (sr_session_dev_add(sdi) != SR_OK) {
                g_critical("Failed to use device.");
                sr_session_destroy();
                return;
        }
 
-       if (devargs) {
-               if (set_dev_options(dev, devargs) != SR_OK) {
-                       sr_session_destroy();
-                       return;
+       if (opt_dev) {
+               if ((devargs = parse_generic_arg(opt_dev, FALSE))) {
+                       if (set_dev_options(sdi, devargs) != SR_OK)
+                               return;
+                       g_hash_table_destroy(devargs);
                }
-               g_hash_table_destroy(devargs);
        }
 
-       if (select_probes(dev) != SR_OK)
-            return;
-
-       if (opt_continuous) {
-               if (!sr_driver_hwcap_exists(dev->driver, SR_HWCAP_CONTINUOUS)) {
-                       g_critical("This device does not support continuous sampling.");
-                       sr_session_destroy();
-                       return;
-               }
+       if (select_probes(sdi) != SR_OK) {
+               g_critical("Failed to set probes.");
+               sr_session_destroy();
+               return;
        }
 
        if (opt_triggers) {
-               probelist = sr_parse_triggerstring(dev, opt_triggers);
-               if (!probelist) {
+               if (!(triggerlist = sr_parse_triggerstring(sdi, opt_triggers))) {
                        sr_session_destroy();
                        return;
                }
-
-               max_probes = g_slist_length(dev->probes);
+               max_probes = g_slist_length(sdi->probes);
                for (i = 0; i < max_probes; i++) {
-                       if (probelist[i]) {
-                               sr_dev_trigger_set(dev, i + 1, probelist[i]);
-                               g_free(probelist[i]);
+                       if (triggerlist[i]) {
+                               sr_dev_trigger_set(sdi, i, triggerlist[i]);
+                               g_free(triggerlist[i]);
                        }
                }
-               g_free(probelist);
+               g_free(triggerlist);
        }
 
-       if (opt_time) {
-               time_msec = sr_parse_timestring(opt_time);
-               if (time_msec == 0) {
-                       g_critical("Invalid time '%s'", opt_time);
+       if (opt_continuous) {
+               if (!sr_driver_hwcap_exists(sdi->driver, SR_CONF_CONTINUOUS)) {
+                       g_critical("This device does not support continuous sampling.");
                        sr_session_destroy();
                        return;
                }
+       }
 
-               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;
-                       }
-               }
-               else {
-                       /* time limit set, but device doesn't support this...
-                        * convert to samples based on the samplerate.
-                        */
-                       limit_samples = 0;
-                       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) {
-                               g_critical("Not enough time at this samplerate.");
-                               sr_session_destroy();
-                               return;
-                       }
-
-                       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;
-                       }
+       if (opt_time) {
+               if (set_limit_time(sdi) != SR_OK) {
+                       sr_session_destroy();
+                       return;
                }
        }
 
        if (opt_samples) {
                if ((sr_parse_sizestring(opt_samples, &limit_samples) != SR_OK)
-                       || (dev->driver->dev_config_set(dev->driver_index,
-                           SR_HWCAP_LIMIT_SAMPLES, &limit_samples) != SR_OK)) {
+                               || (sr_dev_config_set(sdi, SR_CONF_LIMIT_SAMPLES,
+                                               &limit_samples) != SR_OK)) {
                        g_critical("Failed to configure sample limit.");
                        sr_session_destroy();
                        return;
@@ -1428,21 +1430,14 @@ static void run_session(void)
 
        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_dev_config_set(sdi, SR_CONF_LIMIT_FRAMES,
+                                               &limit_frames) != SR_OK)) {
+                       g_critical("Failed to configure frame limit.");
                        sr_session_destroy();
                        return;
                }
        }
 
-       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) {
                g_critical("Failed to start session.");
                sr_session_destroy();
@@ -1457,17 +1452,14 @@ static void run_session(void)
        if (opt_continuous)
                clear_anykey();
 
-       if (opt_output_file && default_output_format) {
-               if (sr_session_save(opt_output_file) != SR_OK)
-                       g_critical("Failed to save session.");
-       }
        sr_session_destroy();
+       g_slist_free(devices);
+
 }
 
 static void logger(const gchar *log_domain, GLogLevelFlags log_level,
                   const gchar *message, gpointer cb_data)
 {
-       /* Avoid compiler warnings. */
        (void)log_domain;
        (void)cb_data;
 
@@ -1484,6 +1476,7 @@ static void logger(const gchar *log_domain, GLogLevelFlags log_level,
 
 int main(int argc, char **argv)
 {
+       int ret = 1;
        GOptionContext *context;
        GError *error;
 
@@ -1495,45 +1488,45 @@ int main(int argc, char **argv)
 
        if (!g_option_context_parse(context, &argc, &argv, &error)) {
                g_critical("%s", error->message);
-               return 1;
+               goto done;
        }
 
        /* Set the loglevel (amount of messages to output) for libsigrok. */
        if (sr_log_loglevel_set(opt_loglevel) != SR_OK)
-               return 1;
+               goto done;
 
        /* Set the loglevel (amount of messages to output) for libsigrokdecode. */
        if (srd_log_loglevel_set(opt_loglevel) != SRD_OK)
-               return 1;
+               goto done;
 
-       if (sr_init() != SR_OK)
-               return 1;
+       if (sr_init(&sr_ctx) != SR_OK)
+               goto done;
 
        if (opt_pds) {
                if (srd_init(NULL) != SRD_OK)
-                       return 1;
+                       goto done;
                if (register_pds(NULL, opt_pds) != 0)
-                       return 1;
+                       goto done;
                if (srd_pd_output_callback_add(SRD_OUTPUT_ANN,
                                show_pd_annotations, NULL) != SRD_OK)
-                       return 1;
+                       goto done;
                if (setup_pd_stack() != 0)
-                       return 1;
+                       goto done;
                if (setup_pd_annotations() != 0)
-                       return 1;
+                       goto done;
        }
 
        if (setup_output_format() != 0)
-               return 1;
+               goto done;
 
        if (opt_version)
                show_version();
        else if (opt_list_devs)
                show_dev_list();
+       else if (opt_pds && opt_show)
+               show_pd_detail();
        else if (opt_show)
                show_dev_detail();
-       else if (opt_pds)
-               show_pd_detail();
        else if (opt_input_file)
                load_input_file();
        else if (opt_samples || opt_time || opt_frames || opt_continuous)
@@ -1544,8 +1537,13 @@ int main(int argc, char **argv)
        if (opt_pds)
                srd_exit();
 
+       ret = 0;
+
+done:
+       if (sr_ctx)
+               sr_exit(sr_ctx);
+
        g_option_context_free(context);
-       sr_exit();
 
-       return 0;
+       return ret;
 }