X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=decode.c;h=4ddf34afbbaf00db414a041f4ef2e61ddc27bc0f;hp=a4d4652b36a274dca32d5a104d22c3c912a388b3;hb=HEAD;hpb=a92fe14dd86aceb5c75be26247345faed70c6283 diff --git a/decode.c b/decode.c index a4d4652..12083a1 100644 --- a/decode.c +++ b/decode.c @@ -33,6 +33,10 @@ uint64_t pd_samplerate = 0; extern struct srd_session *srd_sess; +static const char *keyword_assign = "assign_channels"; +static const char *assign_by_index = "auto_index"; +static const char *assign_by_name = "auto_names"; + static int opts_to_gvar(struct srd_decoder *dec, GHashTable *hash, GHashTable **options) { @@ -89,7 +93,7 @@ static int opts_to_gvar(struct srd_decoder *dec, GHashTable *hash, return ret; } -static int move_hash_element(GHashTable *src, GHashTable *dest, void *key) +static int move_hash_element(GHashTable *src, GHashTable *dest, const void *key) { void *orig_key, *value; @@ -111,6 +115,7 @@ static GHashTable *extract_channel_map(struct srd_decoder *dec, GHashTable *hash channel_map = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); + move_hash_element(hash, channel_map, keyword_assign); for (l = dec->channels; l; l = l->next) { pdch = l->data; move_hash_element(hash, channel_map, pdch->id); @@ -139,7 +144,7 @@ static int register_pd(char *opt_pds, char *opt_pd_annotations) pdtokens = g_strsplit(opt_pds, ",", 0); for (pdtok = pdtokens; *pdtok; pdtok++) { - if (!(pd_opthash = parse_generic_arg(*pdtok, TRUE))) { + if (!(pd_opthash = parse_generic_arg(*pdtok, TRUE, NULL))) { g_critical("Invalid protocol decoder option '%s'.", *pdtok); break; } @@ -253,11 +258,21 @@ static void map_pd_inst_channels(void *key, void *value, void *user_data) GHashTable *channel_indices; GSList *channel_list; struct srd_decoder_inst *di; + struct srd_decoder *pd; GVariant *var; void *channel_id; void *channel_target; struct sr_channel *ch; GHashTableIter iter; + enum assign_t { + ASSIGN_UNKNOWN, + ASSIGN_USER_SPEC, + ASSIGN_BY_INDEX, + ASSIGN_BY_NAMES, + } assign; + const char *keyword; + GSList *l_pd, *l_pdo, *l_ch; + struct srd_channel *pdch; channel_map = value; channel_list = user_data; @@ -271,14 +286,108 @@ static void map_pd_inst_channels(void *key, void *value, void *user_data) channel_indices = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GDestroyNotify)g_variant_unref); + /* + * The typical mode of operation is to apply a user specified + * mapping of sigrok channels to decoder inputs. Lack of mapping + * specs will assign no signals (compatible behaviour to earlier + * implementations). + * + * Alternatively we can assign sigrok logic channels to decoder + * inputs in the strict order of channel indices, or when their + * names match. Users need to request this automatic assignment + * though, because this behaviour differs from earlier versions. + * + * Even more sophisticated heuristics of mapping sigrok channels + * to decoder inputs are not implemented here. Later versions + * could translate the Pulseview approach to the C language, but + * it's better to stabilize that logic first before porting it. + */ + assign = ASSIGN_USER_SPEC; + keyword = g_hash_table_lookup(channel_map, keyword_assign); + if (g_hash_table_size(channel_map) != 1) { + assign = ASSIGN_USER_SPEC; + } else if (!keyword) { + assign = ASSIGN_USER_SPEC; + } else if (strcmp(keyword, assign_by_index) == 0) { + assign = ASSIGN_BY_INDEX; + } else if (strcmp(keyword, assign_by_name) == 0) { + assign = ASSIGN_BY_NAMES; + } else { + g_critical("Unknown type of decoder channel assignment: %s.", + keyword); + return; + } + + pd = di->decoder; + if (assign == ASSIGN_BY_INDEX) { + /* + * Iterate the protocol decoder's list of input signals + * (mandatory and optional, never more than the decoder's + * total channels count). Assign sigrok logic channels + * until either is exhausted. Use sigrok channels in the + * very order of their declaration in the input stream. + */ + l_ch = channel_list; + l_pd = pd->channels; + while (l_ch && l_pd) { + ch = l_ch->data; + l_ch = l_ch->next; + if (ch->type != SR_CHANNEL_LOGIC) + break; + if (ch->index >= di->dec_num_channels) + break; + pdch = l_pd->data; + l_pd = l_pd->next; + if (!l_pd) + l_pd = pd->opt_channels; + /* TODO Emit an INFO message. */ + g_hash_table_insert(channel_map, + g_strdup(pdch->id), g_strdup(ch->name)); + } + } else if (assign == ASSIGN_BY_NAMES) { + /* + * Iterate the protocol decoder's list of input signals. + * Search for sigrok logic channels that have matching + * names (case insensitive comparison). Not finding a + * sigrok channel of a given name is non-fatal (could be + * an optional channel, the decoder will check later for + * all mandatory channels to be assigned). + */ + l_pd = pd->channels; + l_pdo = pd->opt_channels; + while (l_pd) { + pdch = l_pd->data; + l_pd = l_pd->next; + if (!l_pd) { + l_pd = l_pdo; + l_pdo = NULL; + } + ch = find_channel(channel_list, pdch->id, FALSE); + if (!ch) { + /* TODO Emit a WARN message. */ + /* if (l_pdo) ...; */ + continue; + } + if (ch->type != SR_CHANNEL_LOGIC) { + /* TODO Emit a WARN message. */ + continue; + } + /* TODO Emit an INFO message. */ + g_hash_table_insert(channel_map, + g_strdup(pdch->id), g_strdup(ch->name)); + } + } + g_hash_table_iter_init(&iter, channel_map); while (g_hash_table_iter_next(&iter, &channel_id, &channel_target)) { + if (strcmp(channel_id, keyword_assign) == 0) + continue; if (!channel_target) { g_printerr("cli: Channel name for \"%s\" missing.\n", (char *)channel_id); continue; } - ch = find_channel(channel_list, channel_target); + ch = find_channel(channel_list, channel_target, TRUE); if (!ch) { g_printerr("cli: No channel with name \"%s\" found.\n", (char *)channel_target); @@ -684,6 +793,8 @@ void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data) show_class = TRUE; show_abbrev = TRUE; } + if (opt_pd_ann_class) + show_class = TRUE; /* * Display the annotation's fields after the layout was