X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-test.git;a=blobdiff_plain;f=decoder%2Fruntc.c;h=90c37b64b76746ed7391b8ae20c90c0703b3310e;hp=c31b7d3d1ddea03dda8e1c7c965013d6f800b3f6;hb=a2d73da38a9eb1a810979c64b6e749a1cc251c9e;hpb=31ddb2fea0f6c1e0241ae92222cc20c801bda2f5 diff --git a/decoder/runtc.c b/decoder/runtc.c index c31b7d3..90c37b6 100644 --- a/decoder/runtc.c +++ b/decoder/runtc.c @@ -52,10 +52,16 @@ struct option { GVariant *value; }; +struct initial_pin_info { + char *name; + int value; +}; + struct pd { const char *name; GSList *channels; GSList *options; + GSList *initial_pins; }; struct output { @@ -142,6 +148,7 @@ static void usage(const char *msg) printf(" -P \n"); printf(" -p (optional)\n"); printf(" -o (optional)\n"); + printf(" -N (optional)\n"); printf(" -i \n"); printf(" -O \n"); printf(" -f (optional)\n"); @@ -375,13 +382,15 @@ static int run_testcase(const char *infile, GSList *pdlist, struct output *op) struct option *option; GVariant *gvar; GHashTable *channels, *opts; - GSList *pdl, *l, *devices; + GSList *pdl, *l, *l2, *devices; int idx, i; int max_channel; char **decoder_class; struct sr_session *sr_sess; gboolean is_number; const char *s; + GArray *initial_pins; + struct initial_pin_info *initial_pin; if (op->outfile) { if ((op->outfd = open(op->outfile, O_CREAT|O_WRONLY, 0600)) == -1) { @@ -391,13 +400,17 @@ static int run_testcase(const char *infile, GSList *pdlist, struct output *op) } } - if (sr_session_load(ctx, infile, &sr_sess) != SR_OK) + if (sr_session_load(ctx, infile, &sr_sess) != SR_OK){ + ERR("sr_session_load() failed"); return FALSE; + } sr_session_dev_list(sr_sess, &devices); - if (srd_session_new(&sess) != SRD_OK) + if (srd_session_new(&sess) != SRD_OK) { + ERR("srd_session_new() failed"); return FALSE; + } sr_session_datafeed_callback_add(sr_sess, sr_cb, sess); switch (op->type) { case SRD_OUTPUT_ANN: @@ -410,6 +423,7 @@ static int run_testcase(const char *infile, GSList *pdlist, struct output *op) cb = srd_cb_py; break; default: + ERR("Invalid op->type"); return FALSE; } srd_pd_output_callback_add(sess, op->type, cb, op); @@ -418,8 +432,10 @@ static int run_testcase(const char *infile, GSList *pdlist, struct output *op) pd = NULL; for (pdl = pdlist; pdl; pdl = pdl->next) { pd = pdl->data; - if (srd_decoder_load(pd->name) != SRD_OK) + if (srd_decoder_load(pd->name) != SRD_OK) { + ERR("srd_decoder_load() failed"); return FALSE; + } /* Instantiate decoder and pass in options. */ opts = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, @@ -443,8 +459,10 @@ static int run_testcase(const char *infile, GSList *pdlist, struct output *op) g_hash_table_insert(opts, option->key, option->value); } } - if (!(di = srd_inst_new(sess, pd->name, opts))) + if (!(di = srd_inst_new(sess, pd->name, opts))) { + ERR("srd_inst_new() failed"); return FALSE; + } g_hash_table_destroy(opts); /* @@ -472,11 +490,37 @@ static int run_testcase(const char *infile, GSList *pdlist, struct output *op) g_hash_table_insert(channels, channel->name, gvar); } - if (srd_inst_channel_set_all(di, channels) != SRD_OK) + if (srd_inst_channel_set_all(di, channels) != SRD_OK) { + ERR("srd_inst_channel_set_all() failed"); return FALSE; + } g_hash_table_destroy(channels); } + /* Set initial pins. */ + if (pd->initial_pins) { + initial_pins = g_array_sized_new(FALSE, TRUE, sizeof(uint8_t), + di->dec_num_channels); + g_array_set_size(initial_pins, di->dec_num_channels); + memset(initial_pins->data, SRD_INITIAL_PIN_SAME_AS_SAMPLE0, + di->dec_num_channels); + + for (l = pd->channels, idx = 0; l; l = l->next, idx++) { + channel = l->data; + for (l2 = pd->initial_pins; l2; l2 = l2->next) { + initial_pin = l2->data; + if (!strcmp(initial_pin->name, channel->name)) + initial_pins->data[idx] = initial_pin->value; + } + } + + if (srd_inst_initial_pins_set_all(di, initial_pins) != SRD_OK) { + ERR("srd_inst_initial_pins_set_all() failed"); + return FALSE; + } + g_array_free(initial_pins, TRUE); + } + /* * If this is not the first decoder in the list, stack it * on top of the previous one. @@ -493,8 +537,10 @@ static int run_testcase(const char *infile, GSList *pdlist, struct output *op) * Bail out if we haven't created an instance of the selected * decoder type of which we shall grab output data from. */ - if (!op->pd_id) + if (!op->pd_id) { + ERR("No / invalid decoder"); return FALSE; + } /* Resolve selected decoder's class index, so we can match. */ dec = srd_decoder_get_by_id(pd->name); @@ -503,9 +549,11 @@ static int run_testcase(const char *infile, GSList *pdlist, struct output *op) l = dec->annotations; else if (op->type == SRD_OUTPUT_BINARY) l = dec->binary; - else + else { /* Only annotations and binary can have a class. */ + ERR("Invalid decoder class"); return FALSE; + } idx = 0; while (l) { decoder_class = l->data; @@ -768,6 +816,7 @@ int main(int argc, char **argv) struct output *op; int ret, c; char *opt_infile, **kv, **opstr; + struct initial_pin_info *initial_pin; op = malloc(sizeof(struct output)); op->pd = NULL; @@ -781,7 +830,7 @@ int main(int argc, char **argv) opt_infile = NULL; pd = NULL; coverage = NULL; - while ((c = getopt(argc, argv, "dP:p:o:i:O:f:c:S")) != -1) { + while ((c = getopt(argc, argv, "dP:p:o:N:i:O:f:c:S")) != -1) { switch (c) { case 'd': debug = TRUE; @@ -789,11 +838,12 @@ int main(int argc, char **argv) case 'P': pd = g_malloc(sizeof(struct pd)); pd->name = g_strdup(optarg); - pd->channels = pd->options = NULL; + pd->channels = pd->options = pd->initial_pins = NULL; pdlist = g_slist_append(pdlist, pd); break; case 'p': case 'o': + case 'N': if (g_slist_length(pdlist) == 0) { /* No previous -P. */ ERR("Syntax error at '%s'", optarg); @@ -812,13 +862,19 @@ int main(int argc, char **argv) channel->channel = strtoul(kv[1], NULL, 10); /* Apply to last PD. */ pd->channels = g_slist_append(pd->channels, channel); - } else { + } else if (c == 'o') { 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); /* Apply to last PD. */ pd->options = g_slist_append(pd->options, option); + } else { + initial_pin = malloc(sizeof(struct initial_pin_info)); + initial_pin->name = g_strdup(kv[0]); + initial_pin->value = strtoul(kv[1], NULL, 10); + /* Apply to last PD. */ + pd->initial_pins = g_slist_append(pd->initial_pins, initial_pin); } break; case 'i':