doc: update manpage, mention -A and annotation rows

[sigrok-cli.git] / decode.c

diff --git a/decode.c b/decode.c
index 2935286f4d5ef92d5acce0894cbed98bfece84cc..225162a45e4cde1238da788ec4e5c8754bd91f93 100644 (file)
--- a/decode.c
+++ b/decode.c
@@ -54,8 +54,9 @@ static int opts_to_gvar(struct srd_decoder *dec, GHashTable *hash,
                if (g_variant_is_of_type(o->def, G_VARIANT_TYPE_STRING)) {
                        gvar = g_variant_new_string(val_str);
                } else if (g_variant_is_of_type(o->def, G_VARIANT_TYPE_INT64)) {
+                       conv = NULL;
                        val_int = strtoll(val_str, &conv, 0);
-                       if (!conv || conv == val_str) {
+                       if (!conv || conv == val_str || *conv) {
                                g_critical("Protocol decoder '%s' option '%s' "
                                                "requires a number.", dec->name, o->id);
                                ret = FALSE;
@@ -309,46 +310,91 @@ int setup_pd_annotations(char *opt_pd_annotations)
        struct srd_decoder *dec;
        int ann_class;
        char **pds, **pdtok, **keyval, **annlist, **ann, **ann_descr;
+       const char *dec_id;
+       const char *ann_txt;
+       const char *ann_id;
+       const struct srd_decoder_annotation_row *row_desc;
+       char **ann_diag;
 
        /* Set up custom list of PDs and annotations to show. */
        pds = g_strsplit(opt_pd_annotations, ",", 0);
        for (pdtok = pds; *pdtok && **pdtok; pdtok++) {
                keyval = g_strsplit(*pdtok, "=", 0);
-               if (!(dec = srd_decoder_get_by_id(keyval[0]))) {
-                       g_critical("Protocol decoder '%s' not found.", keyval[0]);
+               dec_id = keyval[0];
+               if (!(dec = srd_decoder_get_by_id(dec_id))) {
+                       g_critical("Protocol decoder '%s' not found.", dec_id);
+                       g_strfreev(keyval);
+                       g_strfreev(pds);
                        return 1;
                }
                if (!dec->annotations) {
-                       g_critical("Protocol decoder '%s' has no annotations.", keyval[0]);
+                       g_critical("Protocol decoder '%s' has no annotations.", dec_id);
+                       g_strfreev(keyval);
+                       g_strfreev(pds);
                        return 1;
                }
-               if (g_strv_length(keyval) == 2 && keyval[1][0] != '\0') {
-                       annlist = g_strsplit(keyval[1], ":", 0);
+               ann_txt = (g_strv_length(keyval) == 2) ? keyval[1] : NULL;
+               if (ann_txt && *ann_txt) {
+                       annlist = g_strsplit(ann_txt, ":", 0);
                        for (ann = annlist; *ann && **ann; ann++) {
+                               ann_id = *ann;
+                               g_debug("cli: Lookup decoder %s annotation %s.", dec_id, ann_id);
+                               /* Lookup annotation class. */
                                ann_class = 0;
                                for (l = dec->annotations; l; l = l->next, ann_class++) {
                                        ann_descr = l->data;
-                                       if (!canon_cmp(ann_descr[0], *ann))
+                                       if (!canon_cmp(ann_descr[0], ann_id))
                                                /* Found it. */
                                                break;
                                }
-                               if (!l) {
-                                       g_critical("Annotation '%s' not found "
-                                                       "for protocol decoder '%s'.", *ann, keyval[0]);
-                                       return 1;
+                               if (l) {
+                                       l_ann = g_hash_table_lookup(pd_ann_visible, dec_id);
+                                       l_ann = g_slist_append(l_ann, GINT_TO_POINTER(ann_class));
+                                       g_hash_table_replace(pd_ann_visible, g_strdup(dec_id), l_ann);
+                                       g_debug("cli: Showing protocol decoder %s annotation "
+                                                       "class %d (%s).", dec_id, ann_class, ann_descr[0]);
+                                       continue;
                                }
-                               l_ann = g_hash_table_lookup(pd_ann_visible, keyval[0]);
-                               l_ann = g_slist_append(l_ann, GINT_TO_POINTER(ann_class));
-                               g_hash_table_replace(pd_ann_visible, g_strdup(keyval[0]), l_ann);
-                               g_debug("cli: Showing protocol decoder %s annotation "
-                                               "class %d (%s).", keyval[0], ann_class, ann_descr[0]);
+                               /* Lookup annotation row. */
+                               for (l = dec->annotation_rows; l; l = l->next) {
+                                       row_desc = l->data;
+                                       if (!canon_cmp(row_desc->id, ann_id))
+                                               break;
+                               }
+                               if (l) {
+                                       g_debug("cli: Showing decoder %s annotation row %s (%s).",
+                                               dec_id, row_desc->id, row_desc->desc);
+                                       l_ann = g_hash_table_lookup(pd_ann_visible, dec_id);
+                                       for (l = row_desc->ann_classes; l; l = l->next) {
+                                               /*
+                                                * This could just be:
+                                                *   l_ann = g_slist_append(l_ann, l->data);
+                                                * But we are explicit for readability
+                                                * and to access details for diagnostics.
+                                                */
+                                               ann_class = GPOINTER_TO_INT(l->data);
+                                               l_ann = g_slist_append(l_ann, GINT_TO_POINTER(ann_class));
+                                               ann_diag = g_slist_nth_data(dec->annotations, ann_class);
+                                               g_debug("cli: Adding class %d/%s from row %s.",
+                                                       ann_class, ann_diag[0], row_desc->id);
+                                       }
+                                       g_hash_table_replace(pd_ann_visible, g_strdup(dec_id), l_ann);
+                                       continue;
+                               }
+                               /* No match found. */
+                               g_critical("Annotation '%s' not found "
+                                               "for protocol decoder '%s'.", ann_id, dec_id);
+                               g_strfreev(keyval);
+                               g_strfreev(pds);
+                               return 1;
                        }
                } else {
                        /* No class specified: show all of them. */
-                               g_hash_table_insert(pd_ann_visible, g_strdup(keyval[0]),
-                                               g_slist_append(NULL, GINT_TO_POINTER(-1)));
+                       ann_class = -1;
+                       l_ann = g_slist_append(NULL, GINT_TO_POINTER(ann_class));
+                       g_hash_table_insert(pd_ann_visible, g_strdup(dec_id), l_ann);
                        g_debug("cli: Showing all annotation classes for protocol "
-                                       "decoder %s.", keyval[0]);
+                                       "decoder %s.", dec_id);
                }
                g_strfreev(keyval);
        }