X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=decoder%2Fruntc.c;h=f24a180ac4eb720d1a1dc299a0697aa97dafd4c6;hb=450d475b2bfc3e73d56580e0061a508fa67972b0;hp=c31b7d3d1ddea03dda8e1c7c965013d6f800b3f6;hpb=31ddb2fea0f6c1e0241ae92222cc20c801bda2f5;p=sigrok-test.git diff --git a/decoder/runtc.c b/decoder/runtc.c index c31b7d3..f24a180 100644 --- a/decoder/runtc.c +++ b/decoder/runtc.c @@ -17,6 +17,8 @@ * along with this program. If not, see . */ +#include + #include #include #include @@ -52,17 +54,23 @@ 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 { const char *pd; const char *pd_id; int type; - const char *class; + const char *class_; int class_idx; const char *outfile; int outfd; @@ -142,6 +150,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"); @@ -317,10 +326,16 @@ static void sr_cb(const struct sr_dev_inst *sdi, const struct sr_datafeed_packet *packet, void *cb_data) { static int samplecnt = 0; + static gboolean start_sent; + const struct sr_datafeed_logic *logic; struct srd_session *sess; + const struct sr_datafeed_meta *meta; + struct sr_config *src; + GSList *l; GVariant *gvar; uint64_t samplerate; + int ret; int num_samples; struct sr_dev_driver *driver; @@ -329,26 +344,49 @@ static void sr_cb(const struct sr_dev_inst *sdi, driver = sr_dev_inst_driver_get(sdi); switch (packet->type) { + case SR_DF_META: + DBG("Received SR_DF_META"); + meta = packet->payload; + for (l = meta->config; l; l = l->next) { + src = l->data; + switch (src->key) { + case SR_CONF_SAMPLERATE: + samplerate = g_variant_get_uint64(src->data); + ret = srd_session_metadata_set(sess, + SRD_CONF_SAMPLERATE, + g_variant_new_uint64(samplerate)); + if (ret != SRD_OK) + ERR("Setting samplerate failed (meta)"); + break; + default: + /* EMPTY */ + break; + } + } + break; case SR_DF_HEADER: DBG("Received SR_DF_HEADER"); if (sr_config_get(driver, sdi, NULL, SR_CONF_SAMPLERATE, &gvar) != SR_OK) { - ERR("Getting samplerate failed"); + DBG("Getting samplerate failed (SR_DF_HEADER)"); break; } samplerate = g_variant_get_uint64(gvar); g_variant_unref(gvar); - if (srd_session_metadata_set(sess, SRD_CONF_SAMPLERATE, - g_variant_new_uint64(samplerate)) != SRD_OK) { - ERR("Setting samplerate failed"); - break; - } - if (srd_session_start(sess) != SRD_OK) { - ERR("Session start failed"); - break; - } + ret = srd_session_metadata_set(sess, SRD_CONF_SAMPLERATE, + g_variant_new_uint64(samplerate)); + if (ret != SRD_OK) + ERR("Setting samplerate failed (header)"); break; case SR_DF_LOGIC: + DBG("Received SR_DF_LOGIC"); + if (!start_sent) { + if (srd_session_start(sess) != SRD_OK) { + ERR("Session start failed"); + break; + } + start_sent = TRUE; + } logic = packet->payload; num_samples = logic->length / logic->unitsize; DBG("Received SR_DF_LOGIC (%"PRIu64" bytes, unitsize = %d).", @@ -359,6 +397,9 @@ static void sr_cb(const struct sr_dev_inst *sdi, break; case SR_DF_END: DBG("Received SR_DF_END"); +#if defined HAVE_SRD_SESSION_SEND_EOF && HAVE_SRD_SESSION_SEND_EOF + (void)srd_session_send_eof(sess); +#endif break; } @@ -375,13 +416,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 +434,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 +457,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 +466,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 +493,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 +524,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,23 +571,27 @@ 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); - if (op->class) { + if (op->class_) { if (op->type == SRD_OUTPUT_ANN) 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; - if (!strcmp(decoder_class[0], op->class)) { + if (!strcmp(decoder_class[0], op->class_)) { op->class_idx = idx; break; } @@ -518,10 +600,10 @@ static int run_testcase(const char *infile, GSList *pdlist, struct output *op) } if (op->class_idx == -1) { ERR("Output class '%s' not found in decoder %s.", - op->class, pd->name); + op->class_, pd->name); return FALSE; } - 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); @@ -768,12 +850,13 @@ 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; op->pd_id = NULL; op->type = -1; - op->class = NULL; + op->class_ = NULL; op->class_idx = -1; op->outfd = 1; @@ -781,7 +864,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 +872,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 +896,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': @@ -848,7 +938,7 @@ int main(int argc, char **argv) usage(NULL); } if (opstr[2]) - op->class = g_strdup(opstr[2]); + op->class_ = g_strdup(opstr[2]); g_strfreev(opstr); break; case 'f':