X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=sigrok-cli.c;h=3034439df9d0733a5384e3a5fa4186e82419f6d3;hp=a9f15285e8faa64028904924fb8da6176801bc7d;hb=eb6162bdcc93c12e3f2cfd8728c5cc6880cc60db;hpb=498f9167faca80af9cc813979ea87b12b5bb9c87

diff --git a/sigrok-cli.c b/sigrok-cli.c
index a9f1528..3034439 100644
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -204,11 +204,12 @@ static void show_dev_list(void)
 static void show_dev_detail(void)
 {
 	struct sr_dev *dev;
-	struct sr_hwcap_option *hwo;
+	const struct sr_hwcap_option *hwo;
 	const struct sr_samplerates *samplerates;
 	struct sr_rational *rationals;
 	uint64_t *integers;
-	int cap, *hwcaps, i;
+	const int *hwcaps;
+	int cap, i;
 	char *s, *title;
 	const char *charopts, **stropts;
 
@@ -472,7 +473,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);
@@ -581,7 +582,7 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet)
 			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);
 				g_free(output_buf);
 			}
@@ -621,9 +622,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:
@@ -744,7 +742,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);
@@ -760,17 +758,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;