X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=sigrok-cli.c;h=b39dcf6b92225525015548a6cd1a8b9505b5c8aa;hp=edd5d4e962432a35876a73f1e5c2383a5c135e0d;hb=a2e8008830a99fe0e45399e4360f2d77ce577f2c;hpb=53993299f9d2b3043f4f6a1d35af444d0afa139f

diff --git a/sigrok-cli.c b/sigrok-cli.c
index edd5d4e..b39dcf6 100644
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -30,19 +30,20 @@
 #include <errno.h>
 #include <glib.h>
 #include <glib/gstdio.h>
-#include <sigrok.h>
+#include <libsigrok/libsigrok.h>
 #include "sigrok-cli.h"
 #include "config.h"
 
 #define DEFAULT_OUTPUT_FORMAT "bits:width=64"
 
+extern struct sr_hwcap_option sr_drvopts[];
 extern struct sr_hwcap_option sr_hwcap_options[];
 
 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 GHashTable *pd_ann_visible = NULL;
 
 static gboolean opt_version = FALSE;
@@ -51,6 +52,7 @@ 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_drv = NULL;
 static gchar *opt_dev = NULL;
 static gchar *opt_probes = NULL;
 static gchar *opt_triggers = NULL;
@@ -59,8 +61,10 @@ static gchar *opt_pd_stack = NULL;
 static gchar *opt_pd_annotations = NULL;
 static gchar *opt_input_format = NULL;
 static gchar *opt_output_format = NULL;
+static gchar *opt_show = NULL;
 static gchar *opt_time = NULL;
 static gchar *opt_samples = NULL;
+static gchar *opt_frames = NULL;
 static gchar *opt_continuous = NULL;
 
 static GOptionEntry optargs[] = {
@@ -70,6 +74,8 @@ static GOptionEntry optargs[] = {
 			"Set libsigrok/libsigrokdecode loglevel", NULL},
 	{"list-devices", 'D', 0, G_OPTION_ARG_NONE, &opt_list_devs,
 			"Scan for devices", NULL},
+	{"driver", 0, 0, G_OPTION_ARG_STRING, &opt_drv,
+			"Use only this driver", NULL},
 	{"device", 'd', 0, G_OPTION_ARG_STRING, &opt_dev,
 			"Use specified device", NULL},
 	{"input-file", 'i', 0, G_OPTION_ARG_FILENAME, &opt_input_file,
@@ -92,15 +98,107 @@ static GOptionEntry optargs[] = {
 			"Protocol decoder stack", NULL},
 	{"protocol-decoder-annotations", 'A', 0, G_OPTION_ARG_STRING, &opt_pd_annotations,
 			"Protocol decoder annotation(s) to show", NULL},
+	{"show", 0, 0, G_OPTION_ARG_NONE, &opt_show,
+			"Show device detail", 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}
 };
 
+
+/* Convert driver options hash to GSList of struct sr_hwopt. */
+static GSList *hash_to_hwopt(GHashTable *hash)
+{
+	struct sr_hwcap_option *ho;
+	struct sr_hwopt *hwopt;
+	GList *gl, *keys;
+	GSList *opts;
+	char *key, *value;
+
+	keys = g_hash_table_get_keys(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) {
+			g_critical("Unknown option %s", key);
+			return NULL;
+		}
+	}
+	g_list_free(keys);
+
+	return opts;
+}
+
+static GSList *device_scan(void)
+{
+	struct sr_dev_driver **drivers, *driver;
+	GHashTable *drvargs;
+	GSList *drvopts, *devices, *tmpdevs, *l;
+	int i;
+	char *drvname;
+
+	if (opt_drv) {
+		drvargs = parse_generic_arg(opt_drv, TRUE);
+		drvname = g_strdup(g_hash_table_lookup(drvargs, "sigrok_key"));
+		g_hash_table_remove(drvargs, "sigrok_key");
+		driver = NULL;
+		drivers = sr_driver_list();
+		for (i = 0; drivers[i]; i++) {
+			if (strcmp(drivers[i]->name, drvname))
+				continue;
+			driver = drivers[i];
+		}
+		if (!driver) {
+			g_critical("Driver %s not found.", drvname);
+			return NULL;
+		}
+		g_free(drvname);
+		if (sr_driver_init(driver) != SR_OK) {
+			g_critical("Failed to initialize driver.");
+			return NULL;
+		}
+		drvopts = NULL;
+		if (g_hash_table_size(drvargs) > 0)
+			if (!(drvopts = hash_to_hwopt(drvargs)))
+				/* Unknown options, already logged. */
+				return NULL;
+		devices = sr_driver_scan(driver, 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) {
+				g_critical("Failed to initialize driver.");
+				return NULL;
+			}
+			tmpdevs = sr_driver_scan(driver, NULL);
+			for (l = tmpdevs; l; l = l->next)
+				devices = g_slist_append(devices, l->data);
+			g_slist_free(tmpdevs);
+		}
+	}
+
+	return devices;
+}
+
 static void show_version(void)
 {
 	GSList *l;
@@ -151,11 +249,8 @@ static void show_version(void)
 	printf("\n");
 }
 
-static void print_dev_line(const struct sr_dev *dev)
+static void print_dev_line(const struct sr_dev_inst *sdi)
 {
-	const struct sr_dev_inst *sdi;
-
-	sr_dev_info_get(dev, SR_DI_INST, (const void **)&sdi);
 
 	if (sdi->vendor && sdi->vendor[0])
 		printf("%s ", sdi->vendor);
@@ -163,59 +258,68 @@ static void print_dev_line(const struct sr_dev *dev)
 		printf("%s ", sdi->model);
 	if (sdi->version && sdi->version[0])
 		printf("%s ", sdi->version);
-	if (dev->probes)
-		printf("with %d probes", g_slist_length(dev->probes));
+	if (sdi->probes)
+		printf("with %d probes", g_slist_length(sdi->probes));
 	printf("\n");
 }
 
 static void show_dev_list(void)
 {
-	struct sr_dev *dev, *demo_dev;
-	GSList *devs, *l;
-	int devcnt;
-
-	devcnt = 0;
-	devs = sr_dev_list();
+	struct sr_dev_inst *sdi;
+	GSList *devices, *l;
 
-	if (g_slist_length(devs) == 0)
+	if (!(devices = device_scan()))
 		return;
 
-	printf("The following devices were found:\nID    Device\n");
-	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_dev_line(dev);
-	}
-	if (demo_dev) {
-		printf("demo  ");
-		print_dev_line(demo_dev);
+	printf("The following devices were found:\n");
+	for (l = devices; l; l = l->next) {
+		sdi = l->data;
+		print_dev_line(sdi);
 	}
+	g_slist_free(devices);
+
 }
 
 static void show_dev_detail(void)
 {
-	struct sr_dev *dev;
-	struct sr_hwcap_option *hwo;
+	struct sr_dev_inst *sdi;
+	const struct sr_hwcap_option *hwo;
 	const struct sr_samplerates *samplerates;
-	int cap, *hwcaps, i;
+	struct sr_rational *rationals;
+	GSList *devices;
+	uint64_t *integers;
+	const int *hwopts, *hwcaps;
+	int cap, num_devices, n, i;
 	char *s, *title;
 	const char *charopts, **stropts;
 
-	dev = parse_devstring(opt_dev);
-	if (!dev) {
-		printf("No such device. Use -D to list all devices.\n");
+	if (!(devices = device_scan())) {
+		g_critical("No devices found.");
 		return;
 	}
 
-	print_dev_line(dev);
+	num_devices = g_slist_length(devices);
+	if (num_devices > 1) {
+		if (!opt_dev) {
+			g_critical("%d devices found. Use --list-devices to show them, "
+					"and --device to select one.", num_devices);
+			return;
+		}
+		/* opt_dev is NULL if not specified, which is fine. */
+		n = strtol(opt_dev, NULL, 10);
+		if (n >= num_devices) {
+			g_critical("%d devices found, numbered starting from 0.",
+					num_devices);
+			return;
+		}
+		sdi = g_slist_nth_data(devices, n);
+	} else
+		sdi = g_slist_nth_data(devices, 0);
+
+	print_dev_line(sdi);
 
-	if (sr_dev_info_get(dev, SR_DI_TRIGGER_TYPES,
-					(const void **)&charopts) == SR_OK) {
+	if (sr_info_get(sdi->driver, SR_DI_TRIGGER_TYPES, (const void **)&charopts,
+			sdi) == SR_OK && charopts) {
 		printf("Supported triggers: ");
 		while (*charopts) {
 			printf("%c ", *charopts);
@@ -224,8 +328,22 @@ static void show_dev_detail(void)
 		printf("\n");
 	}
 
-	title = "Supported options:\n";
-	hwcaps = dev->driver->hwcap_get_all();
+	if ((sr_info_get(sdi->driver, SR_DI_HWOPTS, (const void **)&hwopts,
+			NULL) == SR_OK) && hwopts) {
+		printf("Supported driver options:\n");
+		for (i = 0; hwopts[i]; i++) {
+			if (!(hwo = sr_drvopt_get(hwopts[i])))
+				continue;
+			printf("    %s\n", hwo->shortname);
+		}
+	}
+
+	title = "Supported device options:\n";
+	if ((sr_info_get(sdi->driver, SR_DI_HWCAPS, (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])))
 			continue;
@@ -236,24 +354,25 @@ static void show_dev_detail(void)
 		}
 
 		if (hwo->hwcap == SR_HWCAP_PATTERN_MODE) {
+			/* Pattern generator modes */
 			printf("    %s", hwo->shortname);
-			if (sr_dev_info_get(dev, SR_DI_PATTERNS,
-					(const void **)&stropts) == SR_OK) {
+			if (sr_info_get(sdi->driver, SR_DI_PATTERNS,
+					(const void **)&stropts, sdi) == SR_OK) {
 				printf(" - supported patterns:\n");
 				for (i = 0; stropts[i]; i++)
 					printf("      %s\n", stropts[i]);
 			} else {
 				printf("\n");
 			}
+
 		} else if (hwo->hwcap == SR_HWCAP_SAMPLERATE) {
-			printf("    %s", hwo->shortname);
 			/* Supported samplerates */
-			if (sr_dev_info_get(dev, SR_DI_SAMPLERATES,
-					(const void **)&samplerates) != SR_OK) {
+			printf("    %s", hwo->shortname);
+			if (sr_info_get(sdi->driver, SR_DI_SAMPLERATES,
+					(const void **)&samplerates, sdi) != SR_OK) {
 				printf("\n");
 				continue;
 			}
-
 			if (samplerates->step) {
 				/* low */
 				if (!(s = sr_samplerate_string(samplerates->low)))
@@ -272,14 +391,89 @@ static void show_dev_detail(void)
 				g_free(s);
 			} else {
 				printf(" - supported samplerates:\n");
-				for (i = 0; samplerates->list[i]; i++) {
+				for (i = 0; samplerates->list[i]; i++)
 					printf("      %s\n", sr_samplerate_string(samplerates->list[i]));
-				}
 			}
+
+		} else if (hwo->hwcap == SR_HWCAP_BUFFERSIZE) {
+			/* Supported buffer sizes */
+			printf("    %s", hwo->shortname);
+			if (sr_info_get(sdi->driver, SR_DI_BUFFERSIZES,
+					(const void **)&integers, sdi) != SR_OK) {
+				printf("\n");
+				continue;
+			}
+			printf(" - supported buffer sizes:\n");
+			for (i = 0; integers[i]; i++)
+				printf("      %"PRIu64"\n", integers[i]);
+
+		} else if (hwo->hwcap == SR_HWCAP_TIMEBASE) {
+			/* Supported time bases */
+			printf("    %s", hwo->shortname);
+			if (sr_info_get(sdi->driver, SR_DI_TIMEBASES,
+					(const void **)&rationals, sdi) != SR_OK) {
+				printf("\n");
+				continue;
+			}
+			printf(" - supported time bases:\n");
+			for (i = 0; rationals[i].p && rationals[i].q; i++)
+				printf("      %s\n", sr_period_string(
+						rationals[i].p * rationals[i].q));
+
+		} else if (hwo->hwcap == SR_HWCAP_TRIGGER_SOURCE) {
+			/* Supported trigger sources */
+			printf("    %s", hwo->shortname);
+			if (sr_info_get(sdi->driver, SR_DI_TRIGGER_SOURCES,
+					(const void **)&stropts, sdi) != SR_OK) {
+				printf("\n");
+				continue;
+			}
+			printf(" - supported trigger sources:\n");
+			for (i = 0; stropts[i]; i++)
+				printf("      %s\n", stropts[i]);
+
+		} else if (hwo->hwcap == SR_HWCAP_FILTER) {
+			/* Supported trigger sources */
+			printf("    %s", hwo->shortname);
+			if (sr_info_get(sdi->driver, SR_DI_FILTERS,
+					(const void **)&stropts, sdi) != SR_OK) {
+				printf("\n");
+				continue;
+			}
+			printf(" - supported filter targets:\n");
+			for (i = 0; stropts[i]; i++)
+				printf("      %s\n", stropts[i]);
+
+		} else if (hwo->hwcap == SR_HWCAP_VDIV) {
+			/* Supported volts/div values */
+			printf("    %s", hwo->shortname);
+			if (sr_info_get(sdi->driver, SR_DI_VDIVS,
+					(const void **)&rationals, sdi) != SR_OK) {
+				printf("\n");
+				continue;
+			}
+			printf(" - supported volts/div:\n");
+			for (i = 0; rationals[i].p && rationals[i].q; i++)
+				printf("      %s\n", sr_voltage_string(	&rationals[i]));
+
+		} else if (hwo->hwcap == SR_HWCAP_COUPLING) {
+			/* Supported coupling settings */
+			printf("    %s", hwo->shortname);
+			if (sr_info_get(sdi->driver, SR_DI_COUPLING,
+					(const void **)&stropts, sdi) != SR_OK) {
+				printf("\n");
+				continue;
+			}
+			printf(" - supported coupling options:\n");
+			for (i = 0; stropts[i]; i++)
+				printf("      %s\n", stropts[i]);
+
 		} else {
+			/* Everything else */
 			printf("    %s\n", hwo->shortname);
 		}
 	}
+
 }
 
 static void show_pd_detail(void)
@@ -342,22 +536,21 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet)
 {
 	static struct sr_output *o = NULL;
 	static int logic_probelist[SR_MAX_NUM_PROBES] = { 0 };
-	static int analog_probelist[SR_MAX_NUM_PROBES] = { 0 };
+	static struct sr_probe *analog_probelist[SR_MAX_NUM_PROBES];
 	static uint64_t received_samples = 0;
 	static int unitsize = 0;
 	static int triggered = 0;
 	static FILE *outfile = NULL;
 	static int num_analog_probes = 0;
 	struct sr_probe *probe;
-	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;
+	static int num_enabled_analog_probes = 0;
 	int num_enabled_probes, sample_size, ret, i;
 	uint64_t output_len, filter_out_len;
 	uint8_t *output_buf, *filter_out;
-	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)
@@ -391,7 +584,7 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet)
 		}
 		if (o->format->event) {
 			o->format->event(o, SR_DF_END, &output_buf, &output_len);
-			if (output_len) {
+			if (output_buf) {
 				if (outfile)
 					fwrite(output_buf, 1, output_len, outfile);
 				g_free(output_buf);
@@ -404,7 +597,7 @@ 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_halt();
+		sr_session_stop();
 		if (outfile && outfile != stdout)
 			fclose(outfile);
 		g_free(o);
@@ -495,13 +688,14 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet)
 		if (opt_pds) {
 			if (srd_session_send(received_samples, (uint8_t*)filter_out,
 					filter_out_len) != SRD_OK)
-				sr_session_halt();
+				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_len) {
+			if (output_buf) {
 				fwrite(output_buf, 1, output_len, outfile);
+				fflush(outfile);
 				g_free(output_buf);
 			}
 		}
@@ -515,11 +709,11 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet)
 		g_message("cli: Received SR_DF_META_ANALOG");
 		meta_analog = packet->payload;
 		num_analog_probes = meta_analog->num_probes;
-		num_enabled_probes = 0;
+		num_enabled_analog_probes = 0;
 		for (i = 0; i < num_analog_probes; i++) {
 			probe = g_slist_nth_data(dev->probes, i);
 			if (probe->enabled)
-				analog_probelist[num_enabled_probes++] = probe->index;
+				analog_probelist[num_enabled_analog_probes++] = probe;
 		}
 
 		outfile = stdout;
@@ -540,9 +734,6 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet)
 				outfile = g_fopen(opt_output_file, "wb");
 			}
 		}
-//		if (opt_pds)
-//			srd_session_start(num_enabled_probes, unitsize,
-//					meta_logic->samplerate);
 		break;
 
 	case SR_DF_ANALOG:
@@ -554,18 +745,45 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet)
 		if (limit_samples && received_samples >= limit_samples)
 			break;
 
-		for (i = 0; i < analog->num_samples; i++) {
-			asample1 = analog->data[i * num_analog_probes];
-			asample2 = analog->data[i * num_analog_probes + 1];
-			printf("CH1 %f   CH2 %f\n", asample1, asample2);
-//			write(STDOUT_FILENO, &asample1, sizeof(float));
+		if (o->format->data && packet->type == o->format->df_type) {
+			o->format->data(o, (const uint8_t *)analog->data,
+					analog->num_samples * sizeof(float),
+					&output_buf, &output_len);
+			if (output_buf) {
+				fwrite(output_buf, 1, output_len, outfile);
+				fflush(outfile);
+				g_free(output_buf);
+			}
 		}
 
-//		output_len = 0;
-//		if (o->format->data && packet->type == o->format->df_type)
-//			o->format->data(o, filter_out, filter_out_len, &output_buf, &output_len);
-
 		received_samples += analog->num_samples;
+		break;
+
+	case SR_DF_FRAME_BEGIN:
+		g_debug("cli: received SR_DF_FRAME_BEGIN");
+		if (o->format->event) {
+			o->format->event(o, SR_DF_FRAME_BEGIN, &output_buf,
+					 &output_len);
+			if (output_buf) {
+				fwrite(output_buf, 1, output_len, outfile);
+				fflush(outfile);
+				g_free(output_buf);
+			}
+		}
+		break;
+
+	case SR_DF_FRAME_END:
+		g_debug("cli: received SR_DF_FRAME_END");
+		if (o->format->event) {
+			o->format->event(o, SR_DF_FRAME_END, &output_buf,
+					 &output_len);
+			if (output_buf) {
+				fwrite(output_buf, 1, output_len, outfile);
+				fflush(outfile);
+				g_free(output_buf);
+			}
+		}
+		break;
 
 	default:
 		g_message("received unknown packet type %d", packet->type);
@@ -595,7 +813,7 @@ static int register_pds(struct sr_dev *dev, const char *pdstring)
 	pd_opthash = NULL;
 	pdtokens = g_strsplit(pdstring, ",", 0);
 	for (pdtok = pdtokens; *pdtok; pdtok++) {
-		if (!(pd_opthash = parse_generic_arg(*pdtok))) {
+		if (!(pd_opthash = parse_generic_arg(*pdtok, TRUE))) {
 			g_critical("Invalid protocol decoder option '%s'.", *pdtok);
 			goto err_out;
 		}
@@ -647,7 +865,7 @@ int setup_pd_stack(void)
 {
 	struct srd_decoder_inst *di_from, *di_to;
 	int ret, i;
-	char **pds;
+	char **pds, **ids;
 
 	/* Set up the protocol decoder stack. */
 	pds = g_strsplit(opt_pds, ",", 0);
@@ -663,17 +881,26 @@ int setup_pd_stack(void)
 			}
 		}
 
-		if (!(di_from = srd_inst_find_by_id(pds[0]))) {
+		/* First PD goes at the bottom of the stack. */
+		ids = g_strsplit(pds[0], ":", 0);
+		if (!(di_from = srd_inst_find_by_id(ids[0]))) {
+			g_strfreev(ids);
 			g_critical("Cannot stack protocol decoder '%s': "
 					"instance not found.", pds[0]);
 			return 1;
 		}
+		g_strfreev(ids);
+
+		/* Every subsequent PD goes on top. */
 		for (i = 1; pds[i]; i++) {
-			if (!(di_to = srd_inst_find_by_id(pds[i]))) {
+			ids = g_strsplit(pds[i], ":", 0);
+			if (!(di_to = srd_inst_find_by_id(ids[0]))) {
+				g_strfreev(ids);
 				g_critical("Cannot stack protocol decoder '%s': "
 						"instance not found.", pds[i]);
 				return 1;
 			}
+			g_strfreev(ids);
 			if ((ret = srd_inst_stack(di_from, di_to)) != SRD_OK)
 				return 1;
 
@@ -753,7 +980,8 @@ int setup_output_format(void)
 		 */
 		default_output_format = TRUE;
 	}
-	fmtargs = parse_generic_arg(opt_output_format);
+
+	fmtargs = parse_generic_arg(opt_output_format, TRUE);
 	fmtspec = g_hash_table_lookup(fmtargs, "sigrok_key");
 	if (!fmtspec) {
 		g_critical("Invalid output format.");
@@ -811,6 +1039,7 @@ void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data)
 	for (i = 0; annotations[i]; i++)
 		printf("\"%s\" ", annotations[i]);
 	printf("\n");
+	fflush(stdout);
 }
 
 static int select_probes(struct sr_dev *dev)
@@ -874,7 +1103,7 @@ static struct sr_input_format *determine_input_file_format(
 	/* If the user specified -I / --input-format, use that one. */
 	if (opt) {
 		for (i = 0; inputs[i]; i++) {
-			if (strcasecmp(inputs[i]->id, opt_input_format))
+			if (strcasecmp(inputs[i]->id, opt))
 				continue;
 			g_debug("Using user-specified input file format '%s'.",
 					inputs[i]->id);
@@ -883,7 +1112,7 @@ static struct sr_input_format *determine_input_file_format(
 
 		/* The user specified an unknown input format, return NULL. */
 		g_critical("Error: specified input file format '%s' is "
-			"unknown.", opt_input_format);
+			"unknown.", opt);
 		return NULL;
 	}
 
@@ -907,14 +1136,25 @@ static struct sr_input_format *determine_input_file_format(
 
 static void load_input_file_format(void)
 {
+	GHashTable *fmtargs = NULL;
 	struct stat st;
 	struct sr_input *in;
 	struct sr_input_format *input_format;
+	char *fmtspec = NULL;
+
+	if (opt_input_format) {
+		fmtargs = parse_generic_arg(opt_input_format);
+		fmtspec = g_hash_table_lookup(fmtargs, "sigrok_key");
+	}
 
 	if (!(input_format = determine_input_file_format(opt_input_file,
-						   opt_input_format)))
+						   fmtspec))) {
 		/* The exact cause was already logged. */
 		return;
+	}
+;
+	if (fmtargs)
+		g_hash_table_remove(fmtargs, "sigrok_key");
 
 	if (stat(opt_input_file, &st) == -1) {
 		g_critical("Failed to load %s: %s", opt_input_file,
@@ -928,7 +1168,7 @@ static void load_input_file_format(void)
 		exit(1);
 	}
 	in->format = input_format;
-	in->param = input_format_param;
+	in->param = fmtargs;
 	if (in->format->init) {
 		if (in->format->init(in) != SR_OK) {
 			g_critical("Input format init failed.");
@@ -953,6 +1193,9 @@ static void load_input_file_format(void)
 			g_critical("Failed to save session.");
 	}
 	sr_session_destroy();
+
+	if (fmtargs)
+		g_hash_table_destroy(fmtargs);
 }
 
 static void load_input_file(void)
@@ -971,31 +1214,16 @@ static void load_input_file(void)
 	}
 }
 
-int num_real_devs(void)
-{
-	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_devs;
-}
-
 static int set_dev_options(struct sr_dev *dev, GHashTable *args)
 {
 	GHashTableIter iter;
 	gpointer key, value;
 	int ret, i;
+	float tmp_float;
 	uint64_t tmp_u64;
-	gboolean found;
+	struct sr_rational tmp_rat;
 	gboolean tmp_bool;
+	gboolean found;
 
 	g_hash_table_iter_init(&iter, args);
 	while (g_hash_table_iter_next(&iter, &key, &value)) {
@@ -1030,6 +1258,23 @@ static int set_dev_options(struct sr_dev *dev, GHashTable *args)
 						sr_hwcap_options[i].hwcap, 
 						GINT_TO_POINTER(tmp_bool));
 				break;
+			case SR_T_FLOAT:
+				tmp_float = strtof(value, NULL);
+				ret = dev->driver->dev_config_set(dev->driver_index,
+						sr_hwcap_options[i].hwcap, &tmp_float);
+				break;
+			case SR_T_RATIONAL_PERIOD:
+				if ((ret = sr_parse_period(value, &tmp_rat)) != SR_OK)
+					break;
+				ret = dev->driver->dev_config_set(dev->driver_index,
+						sr_hwcap_options[i].hwcap, &tmp_rat);
+				break;
+			case SR_T_RATIONAL_VOLT:
+				if ((ret = sr_parse_voltage(value, &tmp_rat)) != SR_OK)
+					break;
+				ret = dev->driver->dev_config_set(dev->driver_index,
+						sr_hwcap_options[i].hwcap, &tmp_rat);
+				break;
 			default:
 				ret = SR_ERR;
 			}
@@ -1181,6 +1426,16 @@ 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_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.");
@@ -1275,14 +1530,14 @@ int main(int argc, char **argv)
 		show_version();
 	else if (opt_list_devs)
 		show_dev_list();
-	else if (opt_input_file)
-		load_input_file();
-	else if (opt_samples || opt_time || opt_continuous)
-		run_session();
-	else if (opt_dev)
+	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)
+		run_session();
 	else
 		printf("%s", g_option_context_get_help(context, TRUE, NULL));