X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=instance.c;h=23732ddb3ad1645825aa389c61d2dfa413055206;hp=99caabbe882f3da561d3f7dca3414b4a7ba2cb23;hb=0102e92b4979de776cdabf50fcff69d8c95f30ca;hpb=755e4a1e70ef3de760ecdf4db67f3b2a75458143

diff --git a/instance.c b/instance.c
index 99caabb..23732dd 100644
--- a/instance.c
+++ b/instance.c
@@ -30,11 +30,6 @@
 
 extern SRD_PRIV GSList *sessions;
 
-static void srd_inst_join_decode_thread(struct srd_decoder_inst *di);
-static void srd_inst_reset_state(struct srd_decoder_inst *di);
-static void oldpins_array_seed(struct srd_decoder_inst *di);
-static void oldpins_array_free(struct srd_decoder_inst *di);
-
 /** @endcond */
 
 /**
@@ -51,6 +46,36 @@ static void oldpins_array_free(struct srd_decoder_inst *di);
  * @{
  */
 
+static void oldpins_array_seed(struct srd_decoder_inst *di)
+{
+	size_t count;
+	GArray *arr;
+
+	if (!di)
+		return;
+	if (di->old_pins_array)
+		return;
+
+	count = di->dec_num_channels;
+	arr = g_array_sized_new(FALSE, TRUE, sizeof(uint8_t), count);
+	g_array_set_size(arr, count);
+	memset(arr->data, SRD_INITIAL_PIN_SAME_AS_SAMPLE0, count);
+	di->old_pins_array = arr;
+}
+
+static void oldpins_array_free(struct srd_decoder_inst *di)
+{
+	if (!di)
+		return;
+	if (!di->old_pins_array)
+		return;
+
+	srd_dbg("%s: Releasing initial pin state.", di->inst_id);
+
+	g_array_free(di->old_pins_array, TRUE);
+	di->old_pins_array = NULL;
+}
+
 /**
  * Set one or more options in a decoder instance.
  *
@@ -504,6 +529,27 @@ SRD_API int srd_inst_stack(struct srd_session *sess,
 		sess->di_list = g_slist_remove(sess->di_list, di_top);
 	}
 
+	/*
+	 * Check if there's at least one matching input/output pair
+	 * for the stacked PDs. We warn if that's not the case, but it's
+	 * not a hard error for the time being.
+	 */
+	gboolean at_least_one_match = FALSE;
+	for (GSList *out = di_bottom->decoder->outputs; out; out = out->next) {
+		const char *o = out->data;
+		for (GSList *in = di_top->decoder->inputs; in; in = in->next) {
+			const char *i = in->data;
+			if (!strcmp(o, i)) {
+				at_least_one_match = TRUE;
+				break;
+			}
+		}
+	}
+
+	if (!at_least_one_match)
+		srd_warn("No matching in-/output when stacking %s onto %s.",
+			di_top->inst_id, di_bottom->inst_id);
+
 	/* Stack on top of source di. */
 	di_bottom->next_di = g_slist_append(di_bottom->next_di, di_top);
 
@@ -626,36 +672,6 @@ SRD_API int srd_inst_initial_pins_set_all(struct srd_decoder_inst *di, GArray *i
 	return SRD_OK;
 }
 
-static void oldpins_array_seed(struct srd_decoder_inst *di)
-{
-	size_t count;
-	GArray *arr;
-
-	if (!di)
-		return;
-	if (di->old_pins_array)
-		return;
-
-	count = di->dec_num_channels;
-	arr = g_array_sized_new(FALSE, TRUE, sizeof(uint8_t), count);
-	g_array_set_size(arr, count);
-	memset(arr->data, SRD_INITIAL_PIN_SAME_AS_SAMPLE0, count);
-	di->old_pins_array = arr;
-}
-
-static void oldpins_array_free(struct srd_decoder_inst *di)
-{
-	if (!di)
-		return;
-	if (!di->old_pins_array)
-		return;
-
-	srd_dbg("%s: Releasing initial pin state.", di->inst_id);
-
-	g_array_free(di->old_pins_array, TRUE);
-	di->old_pins_array = NULL;
-}
-
 /** @private */
 SRD_PRIV int srd_inst_start(struct srd_decoder_inst *di)
 {