X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=decoder%2Fruntc.c;h=f175f6aeda0c2a052d816431519d2554771af9f5;hb=ffac3f0132640f5f7df22218fa03065d7a1ffad9;hp=49e6a61009d8eaa9eb34ef128921973bcbac245d;hpb=cb5b23ce1221332d20a4d0202c4e845935b8d440;p=sigrok-test.git

diff --git a/decoder/runtc.c b/decoder/runtc.c
index 49e6a61..f175f6a 100644
--- a/decoder/runtc.c
+++ b/decoder/runtc.c
@@ -174,12 +174,12 @@ static void srd_cb_py(struct srd_proto_data *pdata, void *cb_data)
 	GString *out;
 	char *s;
 
-	DBG("Python output from %s", pdata->pdo->di->inst_id);
+	DBG("Python output from %s", pdata->pdo->di->decoder->id);
 	op = cb_data;
 	pydata = pdata->data;
 	DBG("ptr %p", pydata);
 
-	if (strcmp(pdata->pdo->di->inst_id, op->pd))
+	if (strcmp(pdata->pdo->di->decoder->id, op->pd))
 		/* This is not the PD selected for output. */
 		return;
 
@@ -194,7 +194,7 @@ static void srd_cb_py(struct srd_proto_data *pdata, void *cb_data)
 	out = g_string_sized_new(128);
 	g_string_printf(out, "%" PRIu64 "-%" PRIu64 " %s: %s\n",
 			pdata->start_sample, pdata->end_sample,
-			pdata->pdo->di->inst_id, s);
+			pdata->pdo->di->decoder->id, s);
 	g_free(s);
 	if (write(op->outfd, out->str, out->len) == -1)
 		ERR("SRD_OUTPUT_PYTHON callback write failure!");
@@ -210,11 +210,11 @@ static void srd_cb_bin(struct srd_proto_data *pdata, void *cb_data)
 	GString *out;
 	unsigned int i;
 
-	DBG("Binary output from %s", pdata->pdo->di->inst_id);
+	DBG("Binary output from %s", pdata->pdo->di->decoder->id);
 	op = cb_data;
 	pdb = pdata->data;
 
-	if (strcmp(pdata->pdo->di->inst_id, op->pd))
+	if (strcmp(pdata->pdo->di->decoder->id, op->pd))
 		/* This is not the PD selected for output. */
 		return;
 
@@ -228,7 +228,7 @@ static void srd_cb_bin(struct srd_proto_data *pdata, void *cb_data)
 	out = g_string_sized_new(128);
 	g_string_printf(out, "%" PRIu64 "-%" PRIu64 " %s:",
 			pdata->start_sample, pdata->end_sample,
-			pdata->pdo->di->inst_id);
+			pdata->pdo->di->decoder->id);
 	for (i = 0; i < pdb->size; i++) {
 		g_string_append_printf(out, " %.2x", pdb->data[i]);
 	}
@@ -247,11 +247,11 @@ static void srd_cb_ann(struct srd_proto_data *pdata, void *cb_data)
 	int i;
 	char **dec_ann;
 
-	DBG("Annotation output from %s", pdata->pdo->di->inst_id);
+	DBG("Annotation output from %s", pdata->pdo->di->decoder->id);
 	op = cb_data;
 	pda = pdata->data;
 	dec = pdata->pdo->di->decoder;
-	if (strcmp(pdata->pdo->di->inst_id, op->pd))
+	if (strcmp(pdata->pdo->di->decoder->id, op->pd))
 		/* This is not the PD selected for output. */
 		return;
 
@@ -266,7 +266,7 @@ static void srd_cb_ann(struct srd_proto_data *pdata, void *cb_data)
 	line = g_string_sized_new(256);
 	g_string_printf(line, "%" PRIu64 "-%" PRIu64 " %s: %s:",
 			pdata->start_sample, pdata->end_sample,
-			pdata->pdo->di->inst_id, dec_ann[0]);
+			pdata->pdo->di->decoder->id, dec_ann[0]);
 	for (i = 0; pda->ann_text[i]; i++)
 		g_string_append_printf(line, " \"%s\"", pda->ann_text[i]);
 	g_string_append(line, "\n");
@@ -279,12 +279,12 @@ static void srd_cb_ann(struct srd_proto_data *pdata, void *cb_data)
 static void sr_cb(const struct sr_dev_inst *sdi,
 		const struct sr_datafeed_packet *packet, void *cb_data)
 {
+	static int samplecnt = 0;
 	const struct sr_datafeed_logic *logic;
 	struct srd_session *sess;
 	GVariant *gvar;
 	uint64_t samplerate;
 	int num_samples;
-	static int samplecnt = 0;
 	struct sr_dev_driver *driver;
 
 	sess = cb_data;
@@ -318,7 +318,7 @@ static void sr_cb(const struct sr_dev_inst *sdi,
 			logic->length, logic->unitsize);
 		srd_session_send(sess, samplecnt, samplecnt + num_samples,
 				logic->data, logic->length, logic->unitsize);
-		samplecnt += logic->length / logic->unitsize;
+		samplecnt += num_samples;
 		break;
 	case SR_DF_END:
 		DBG("Received SR_DF_END");
@@ -349,7 +349,7 @@ static int run_testcase(const char *infile, GSList *pdlist, struct output *op)
 	if (op->outfile) {
 		if ((op->outfd = open(op->outfile, O_CREAT|O_WRONLY, 0600)) == -1) {
 			ERR("Unable to open %s for writing: %s", op->outfile,
-					strerror(errno));
+					g_strerror(errno));
 			return FALSE;
 		}
 	}