X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=sigrok-cli.c;h=8f3d8e313d70bed817825945cd2991f193c5cbc7;hp=48a409d3048a149a1c535731d675651bac7bbe78;hb=3f2d32a46e81348d722ea287b8bde42bfdd21029;hpb=9eee58d8e29267d017a04bd97be64284eb487c1f

diff --git a/sigrok-cli.c b/sigrok-cli.c
index 48a409d..8f3d8e3 100644
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -46,6 +46,7 @@ static struct sr_output_format *output_format = NULL;
 static int default_output_format = FALSE;
 static char *output_format_param = NULL;
 #ifdef HAVE_SRD
+static struct srd_session *srd_sess = NULL;
 static GHashTable *pd_ann_visible = NULL;
 #endif
 static GByteArray *savebuf;
@@ -177,11 +178,14 @@ static GSList *device_scan(void)
 		}
 		if (!driver) {
 			g_critical("Driver %s not found.", drvname);
+			g_hash_table_destroy(drvargs);
+			g_free(drvname);
 			return NULL;
 		}
 		g_free(drvname);
 		if (sr_driver_init(sr_ctx, driver) != SR_OK) {
 			g_critical("Failed to initialize driver.");
+			g_hash_table_destroy(drvargs);
 			return NULL;
 		}
 		drvopts = NULL;
@@ -192,7 +196,7 @@ static GSList *device_scan(void)
 				return NULL;
 			}
 		}
-		g_hash_table_destroy(drvargs); 
+		g_hash_table_destroy(drvargs);
 		devices = sr_driver_scan(driver, drvopts);
 		g_slist_free_full(drvopts, (GDestroyNotify)free_drvopts);
 	} else {
@@ -252,6 +256,7 @@ static void show_version(void)
 	outputs = sr_output_list();
 	for (i = 0; outputs[i]; i++)
 		printf("  %-20s %s\n", outputs[i]->id, outputs[i]->description);
+	printf("  %-20s %s\n", "sigrok", "Default file output format");
 	printf("\n");
 
 #ifdef HAVE_SRD
@@ -280,7 +285,7 @@ static void print_dev_line(const struct sr_dev_inst *sdi)
 
 	s = g_string_sized_new(128);
 	g_string_assign(s, sdi->driver->name);
-	if (sr_config_get(sdi->driver, SR_CONF_CONN, &gvar, sdi) == SR_OK) {
+	if (sr_config_get(sdi->driver, sdi, NULL, SR_CONF_CONN, &gvar) == SR_OK) {
 		g_string_append(s, ":conn=");
 		g_string_append(s, g_variant_get_string(gvar, NULL));
 		g_variant_unref(gvar);
@@ -362,8 +367,8 @@ static void show_dev_detail(void)
 		return;
 	}
 
-	if ((sr_config_list(sdi->driver, SR_CONF_SCAN_OPTIONS, &gvar_opts,
-			NULL) == SR_OK)) {
+	if ((sr_config_list(sdi->driver, NULL, NULL, SR_CONF_SCAN_OPTIONS,
+			&gvar_opts) == SR_OK)) {
 		opts = g_variant_get_fixed_array(gvar_opts, &num_elements,
 				sizeof(int32_t));
 		printf("Supported driver options:\n");
@@ -375,8 +380,8 @@ static void show_dev_detail(void)
 		g_variant_unref(gvar_opts);
 	}
 
-	if ((sr_config_list(sdi->driver, SR_CONF_DEVICE_OPTIONS, &gvar_opts,
-			sdi) != SR_OK))
+	if ((sr_config_list(sdi->driver, sdi, NULL, SR_CONF_DEVICE_OPTIONS,
+			&gvar_opts) != SR_OK))
 		/* Driver supports no device instance options. */
 		return;
 
@@ -387,8 +392,8 @@ static void show_dev_detail(void)
 			continue;
 
 		if (srci->key == SR_CONF_TRIGGER_TYPE) {
-			if (sr_config_list(sdi->driver, srci->key, &gvar,
-					sdi) != SR_OK) {
+			if (sr_config_list(sdi->driver, sdi, NULL, srci->key,
+					&gvar) != SR_OK) {
 				printf("\n");
 				continue;
 			}
@@ -404,8 +409,8 @@ static void show_dev_detail(void)
 		} else if (srci->key == SR_CONF_PATTERN_MODE) {
 			/* Pattern generator modes */
 			printf("    %s", srci->id);
-			if (sr_config_list(sdi->driver, srci->key, &gvar,
-					sdi) == SR_OK) {
+			if (sr_config_list(sdi->driver, sdi, NULL, srci->key,
+					&gvar) == SR_OK) {
 				printf(" - supported patterns:\n");
 				stropts = g_variant_get_strv(gvar, &num_elements);
 				for (i = 0; i < num_elements; i++)
@@ -418,8 +423,8 @@ static void show_dev_detail(void)
 		} else if (srci->key == SR_CONF_SAMPLERATE) {
 			/* Supported samplerates */
 			printf("    %s", srci->id);
-			if (sr_config_list(sdi->driver, SR_CONF_SAMPLERATE,
-					&gvar_dict, sdi) != SR_OK) {
+			if (sr_config_list(sdi->driver, sdi, NULL, SR_CONF_SAMPLERATE,
+					&gvar_dict) != SR_OK) {
 				printf("\n");
 				continue;
 			}
@@ -461,8 +466,8 @@ static void show_dev_detail(void)
 		} else if (srci->key == SR_CONF_BUFFERSIZE) {
 			/* Supported buffer sizes */
 			printf("    %s", srci->id);
-			if (sr_config_list(sdi->driver, SR_CONF_BUFFERSIZE,
-					&gvar_list, sdi) != SR_OK) {
+			if (sr_config_list(sdi->driver, sdi, NULL,
+					SR_CONF_BUFFERSIZE, &gvar_list) != SR_OK) {
 				printf("\n");
 				continue;
 			}
@@ -476,8 +481,8 @@ static void show_dev_detail(void)
 		} else if (srci->key == SR_CONF_TIMEBASE) {
 			/* Supported time bases */
 			printf("    %s", srci->id);
-			if (sr_config_list(sdi->driver, SR_CONF_TIMEBASE,
-					&gvar_list, sdi) != SR_OK) {
+			if (sr_config_list(sdi->driver, sdi, NULL,
+					SR_CONF_TIMEBASE, &gvar_list) != SR_OK) {
 				printf("\n");
 				continue;
 			}
@@ -495,8 +500,8 @@ static void show_dev_detail(void)
 		} else if (srci->key == SR_CONF_VDIV) {
 			/* Supported volts/div values */
 			printf("    %s", srci->id);
-			if (sr_config_list(sdi->driver, SR_CONF_VDIV,
-					&gvar_list, sdi) != SR_OK) {
+			if (sr_config_list(sdi->driver, sdi, NULL,
+					SR_CONF_VDIV, &gvar_list) != SR_OK) {
 				printf("\n");
 				continue;
 			}
@@ -699,7 +704,7 @@ static void datafeed_in(const struct sr_dev_inst *sdi,
 	GSList *l;
 	GString *out;
 	int sample_size, ret;
-	uint64_t samplerate, output_len, filter_out_len;
+	uint64_t samplerate, output_len, filter_out_len, end_sample;
 	uint8_t *output_buf, *filter_out;
 
 	(void) cb_data;
@@ -751,15 +756,20 @@ static void datafeed_in(const struct sr_dev_inst *sdi,
 #ifdef HAVE_SRD
 		GVariant *gvar;
 		if (opt_pds && logic_probelist->len) {
-			if (sr_config_get(sdi->driver, SR_CONF_SAMPLERATE,
-					&gvar, sdi) != SR_OK) {
-				g_critical("Unable to initialize protocol "
-						"decoders: no samplerate found.");
+			if (sr_config_get(sdi->driver, sdi, NULL, SR_CONF_SAMPLERATE,
+					&gvar, sdi) == SR_OK) {
+				samplerate = g_variant_get_uint64(gvar);
+				g_variant_unref(gvar);
+				if (srd_session_metadata_set(srd_sess, SRD_CONF_SAMPLERATE,
+						g_variant_new_uint64(samplerate)) != SRD_OK) {
+					g_critical("Failed to configure decode session.");
+					break;
+				}
+			}
+			if (srd_session_start(srd_sess) != SRD_OK) {
+				g_critical("Failed to start decode session.");
 				break;
 			}
-			samplerate = g_variant_get_uint64(gvar);
-			g_variant_unref(gvar);
-			srd_session_start(logic_probelist->len, unitsize, samplerate);
 		}
 #endif
 		break;
@@ -773,6 +783,14 @@ static void datafeed_in(const struct sr_dev_inst *sdi,
 			case SR_CONF_SAMPLERATE:
 				samplerate = g_variant_get_uint64(src->data);
 				g_debug("cli: got samplerate %"PRIu64" Hz", samplerate);
+#ifdef HAVE_SRD
+				if (opt_pds) {
+					if (srd_session_metadata_set(srd_sess, SRD_CONF_SAMPLERATE,
+							g_variant_new_uint64(samplerate)) != SRD_OK) {
+						g_critical("Failed to pass samplerate to decoder.");
+					}
+				}
+#endif
 				break;
 			case SR_CONF_SAMPLE_INTERVAL:
 				samplerate = g_variant_get_uint64(src->data);
@@ -813,9 +831,10 @@ static void datafeed_in(const struct sr_dev_inst *sdi,
 		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
+		 * 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 >
@@ -828,8 +847,9 @@ static void datafeed_in(const struct sr_dev_inst *sdi,
 		} else {
 			if (opt_pds) {
 #ifdef HAVE_SRD
-				if (srd_session_send(received_samples, (uint8_t*)filter_out,
-						filter_out_len) != SRD_OK)
+				end_sample = received_samples + filter_out_len / unitsize;
+				if (srd_session_send(srd_sess, received_samples, end_sample,
+						(uint8_t*)filter_out, filter_out_len) != SRD_OK)
 					sr_session_stop();
 #endif
 			} else {
@@ -976,7 +996,7 @@ static int opts_to_gvar(struct srd_decoder *dec, GHashTable *hash,
 		if (g_variant_is_of_type(o->def, G_VARIANT_TYPE_STRING)) {
 			gvar = g_variant_new_string(val_str);
 		} else if (g_variant_is_of_type(o->def, G_VARIANT_TYPE_INT64)) {
-			val_int = strtoll(val_str, &conv, 10);
+			val_int = strtoll(val_str, &conv, 0);
 			if (!conv || conv == val_str) {
 				g_critical("Protocol decoder '%s' option '%s' "
 						"requires a number.", dec->name, o->id);
@@ -1013,7 +1033,7 @@ static int probes_to_gvar(struct srd_decoder *dec, GHashTable *hash,
 			(GDestroyNotify)g_variant_unref);
 
 	all_probes = g_slist_copy(dec->probes);
-	all_probes = g_slist_concat(all_probes, dec->opt_probes);
+	all_probes = g_slist_concat(all_probes, g_slist_copy(dec->opt_probes));
 	for (l = all_probes; l; l = l->next) {
 		p = l->data;
 		if (!(val_str = g_hash_table_lookup(hash, p->id)))
@@ -1090,7 +1110,7 @@ static int register_pds(struct sr_dev *dev, const char *pdstring)
 			break;
 		}
 
-		if (!(di = srd_inst_new(pd_name, options))) {
+		if (!(di = srd_inst_new(srd_sess, pd_name, options))) {
 			g_critical("Failed to instantiate protocol decoder %s.", pd_name);
 			ret = 1;
 			break;
@@ -1146,7 +1166,7 @@ int setup_pd_stack(void)
 
 		/* 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]))) {
+		if (!(di_from = srd_inst_find_by_id(srd_sess, ids[0]))) {
 			g_strfreev(ids);
 			g_critical("Cannot stack protocol decoder '%s': "
 					"instance not found.", pds[0]);
@@ -1157,14 +1177,14 @@ int setup_pd_stack(void)
 		/* Every subsequent PD goes on top. */
 		for (i = 1; pds[i]; i++) {
 			ids = g_strsplit(pds[i], ":", 0);
-			if (!(di_to = srd_inst_find_by_id(ids[0]))) {
+			if (!(di_to = srd_inst_find_by_id(srd_sess, 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)
+			if ((ret = srd_inst_stack(srd_sess, di_from, di_to)) != SRD_OK)
 				return 1;
 
 			/* Don't show annotation from this PD. Only the last PD in
@@ -1268,6 +1288,13 @@ int setup_output_format(void)
 	int i;
 	char *fmtspec;
 
+	if (opt_output_format && !strcmp(opt_output_format, "sigrok")) {
+		/* Doesn't really exist as an output module - this is
+		 * the session save mode. */
+		g_free(opt_output_format);
+		opt_output_format = NULL;
+	}
+
 	if (!opt_output_format) {
 		opt_output_format = DEFAULT_OUTPUT_FORMAT;
 		/* we'll need to remember this so when saving to a file
@@ -1538,7 +1565,7 @@ static int set_dev_options(struct sr_dev_inst *sdi, GHashTable *args)
 			ret = SR_ERR;
 		}
 		if (val)
-			ret = sr_config_set(sdi, srci->key, val);
+			ret = sr_config_set(sdi, NULL, srci->key, val);
 		if (ret != SR_OK) {
 			g_critical("Failed to set device option '%s'.", (char *)key);
 			return ret;
@@ -1594,13 +1621,13 @@ static int set_limit_time(const struct sr_dev_inst *sdi)
 
 	if (sr_dev_has_option(sdi, SR_CONF_LIMIT_MSEC)) {
 		gvar = g_variant_new_uint64(time_msec);
-		if (sr_config_set(sdi, SR_CONF_LIMIT_MSEC, gvar) != SR_OK) {
+		if (sr_config_set(sdi, NULL, SR_CONF_LIMIT_MSEC, gvar) != SR_OK) {
 			g_critical("Failed to configure time limit.");
 			return SR_ERR;
 		}
 	} else if (sr_dev_has_option(sdi, SR_CONF_SAMPLERATE)) {
 		/* Convert to samples based on the samplerate.  */
-		sr_config_get(sdi->driver, SR_CONF_SAMPLERATE, &gvar, sdi);
+		sr_config_get(sdi->driver, sdi, NULL, SR_CONF_SAMPLERATE, &gvar);
 		samplerate = g_variant_get_uint64(gvar);
 		g_variant_unref(gvar);
 		limit_samples = (samplerate) * time_msec / (uint64_t)1000;
@@ -1609,7 +1636,7 @@ static int set_limit_time(const struct sr_dev_inst *sdi)
 			return SR_ERR;
 		}
 		gvar = g_variant_new_uint64(limit_samples);
-		if (sr_config_set(sdi, SR_CONF_LIMIT_SAMPLES, gvar) != SR_OK) {
+		if (sr_config_set(sdi, NULL, SR_CONF_LIMIT_SAMPLES, gvar) != SR_OK) {
 			g_critical("Failed to configure time-based sample limit.");
 			return SR_ERR;
 		}
@@ -1706,7 +1733,7 @@ static void run_session(void)
 			return;
 		}
 		gvar = g_variant_new_uint64(limit_samples);
-		if (sr_config_set(sdi, SR_CONF_LIMIT_SAMPLES, gvar) != SR_OK) {
+		if (sr_config_set(sdi, NULL, SR_CONF_LIMIT_SAMPLES, gvar) != SR_OK) {
 			g_critical("Failed to configure sample limit.");
 			sr_session_destroy();
 			return;
@@ -1720,7 +1747,7 @@ static void run_session(void)
 			return;
 		}
 		gvar = g_variant_new_uint64(limit_frames);
-		if (sr_config_set(sdi, SR_CONF_LIMIT_FRAMES, gvar) != SR_OK) {
+		if (sr_config_set(sdi, NULL, SR_CONF_LIMIT_FRAMES, gvar) != SR_OK) {
 			g_critical("Failed to configure frame limit.");
 			sr_session_destroy();
 			return;
@@ -1741,6 +1768,7 @@ static void run_session(void)
 	if (opt_continuous)
 		clear_anykey();
 
+	sr_session_datafeed_callback_remove_all();
 	sr_session_destroy();
 	g_slist_free(devices);
 
@@ -1761,6 +1789,10 @@ static void logger(const gchar *log_domain, GLogLevelFlags log_level,
 		fprintf(stderr, "%s\n", message);
 		fflush(stderr);
 	}
+
+	if (log_level & (G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL))
+		exit(1);
+
 }
 
 int main(int argc, char **argv)
@@ -1797,9 +1829,13 @@ int main(int argc, char **argv)
 	if (opt_pds) {
 		if (srd_init(NULL) != SRD_OK)
 			goto done;
+		if (srd_session_new(&srd_sess) != SRD_OK) {
+			g_critical("Failed to create new decode session.");
+			goto done;
+		}
 		if (register_pds(NULL, opt_pds) != 0)
 			goto done;
-		if (srd_pd_output_callback_add(SRD_OUTPUT_ANN,
+		if (srd_pd_output_callback_add(srd_sess, SRD_OUTPUT_ANN,
 				show_pd_annotations, NULL) != SRD_OK)
 			goto done;
 		if (setup_pd_stack() != 0)