X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-test.git;a=blobdiff_plain;f=decoder%2Fruntc.c;h=4b534a2564048ae52188c02f2f1d040f9ec1f071;hp=6d40c1f8f46cb0037f8b82bd8a082e6aafafdd5e;hb=59060ffcaada7201ad6942ce2c9bb67361ccbddd;hpb=8a8c92bde034cc6c04835eff0e844406177e947f

diff --git a/decoder/runtc.c b/decoder/runtc.c
index 6d40c1f..4b534a2 100644
--- a/decoder/runtc.c
+++ b/decoder/runtc.c
@@ -136,15 +136,16 @@ static void usage(const char *msg)
 	if (msg)
 		fprintf(stderr, "%s\n", msg);
 
-	printf("Usage: runtc [-dPpoiOf]\n");
-	printf("  -d  Debug\n");
-	printf("  -P  <protocol decoder>\n");
-	printf("  -p  <channelname=channelnum> (optional)\n");
-	printf("  -o  <channeloption=value> (optional)\n");
+	printf("Usage: runtc [-dPpoiOfcS]\n");
+	printf("  -d  (enables debug output)\n");
+	printf("  -P <protocol decoder>\n");
+	printf("  -p <channelname=channelnum> (optional)\n");
+	printf("  -o <channeloption=value> (optional)\n");
 	printf("  -i <input file>\n");
 	printf("  -O <output-pd:output-type[:output-class]>\n");
 	printf("  -f <output file> (optional)\n");
 	printf("  -c <coverage report> (optional)\n");
+	printf("  -S  (enables statistics)\n");
 	exit(msg ? 1 : 0);
 
 }
@@ -174,12 +175,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 +195,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 +211,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 +229,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 +248,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 +267,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 +280,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 +319,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");
@@ -458,16 +459,16 @@ static int run_testcase(const char *infile, GSList *pdlist, struct output *op)
 			if (!strcmp(decoder_class[0], op->class)) {
 				op->class_idx = idx;
 				break;
-			} else
-				idx++;
+			}
+			idx++;
 			l = l->next;
 		}
 		if (op->class_idx == -1) {
 			ERR("Output class '%s' not found in decoder %s.",
 					op->class, pd->name);
 			return FALSE;
-		} else
-			DBG("Class %s index is %d", op->class, op->class_idx);
+		}
+		DBG("Class %s index is %d", op->class, op->class_idx);
 	}
 
 	sr_session_start(sr_sess);
@@ -754,14 +755,14 @@ int main(int argc, char **argv)
 			if (c == 'p') {
 				channel = malloc(sizeof(struct channel));
 				channel->name = g_strdup(kv[0]);
-				channel->channel = strtoul(kv[1], 0, 10);
+				channel->channel = strtoul(kv[1], NULL, 10);
 				/* Apply to last PD. */
 				pd->channels = g_slist_append(pd->channels, channel);
 			} else {
 				option = malloc(sizeof(struct option));
 				option->key = g_strdup(kv[0]);
 				option->value = g_variant_new_string(kv[1]);
-                g_variant_ref_sink(option->value);
+				g_variant_ref_sink(option->value);
 				/* Apply to last PD. */
 				pd->options = g_slist_append(pd->options, option);
 			}