X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=decode.c;h=225162a45e4cde1238da788ec4e5c8754bd91f93;hp=4888a7c506f00b85406a7e92ecf08e11f864afe8;hb=b7360ee68139ab6377876ba72e2a9fd56135db7f;hpb=241f9b13e8d5f7de38f1e4762661dc6fc76ead24 diff --git a/decode.c b/decode.c index 4888a7c..225162a 100644 --- a/decode.c +++ b/decode.c @@ -21,7 +21,6 @@ #include #include #include -#include #include "sigrok-cli.h" #ifdef HAVE_SRD @@ -39,6 +38,7 @@ static int opts_to_gvar(struct srd_decoder *dec, GHashTable *hash, GSList *optl; GVariant *gvar; gint64 val_int; + double val_dbl; int ret; char *val_str, *conv; @@ -54,14 +54,25 @@ 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; break; } gvar = g_variant_new_int64(val_int); + } else if (g_variant_is_of_type(o->def, G_VARIANT_TYPE_DOUBLE)) { + conv = NULL; + val_dbl = strtod(val_str, &conv); + if (!conv || conv == val_str || *conv) { + g_critical("Protocol decoder '%s' option '%s' requires a float number.", + dec->name, o->id); + ret = FALSE; + break; + } + gvar = g_variant_new_double(val_dbl); } else { g_critical("Unsupported type for option '%s' (%s)", o->id, g_variant_get_type_string(o->def)); @@ -299,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); } @@ -417,12 +473,6 @@ int setup_pd_binary(char *opt_pd_binary) return 0; } -static inline void pd_ann_check(gboolean chk) -{ - - assert(chk); -} - void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data) { struct srd_decoder *dec; @@ -431,7 +481,7 @@ void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data) int i; char **ann_descr; gboolean show_ann, show_snum, show_class, show_quotes, show_abbrev; - gboolean show_id_colon; + const char *quote; (void)cb_data; @@ -458,8 +508,8 @@ void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data) return; /* - * Determine the annotation's layout from the verbosity of the - * log level: + * Determine which fields of the annotation to display. Inspect + * user specified options as well as the verbosity of the log level: * - Optionally show the sample numbers for the annotation's span. * - Always show the protocol decoder ID. * - Optionally show the annotation's class description. @@ -470,7 +520,7 @@ void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data) * recipients might have to deal with a set of text variants. */ show_snum = show_class = show_quotes = show_abbrev = FALSE; - if (opt_loglevel > SR_LOG_WARN) { + if (opt_pd_samplenum || opt_loglevel > SR_LOG_WARN) { show_snum = TRUE; } if (opt_loglevel > SR_LOG_WARN) { @@ -480,44 +530,25 @@ void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data) show_class = TRUE; show_abbrev = TRUE; } - /* Backwards (bug?) compatibility. */ - show_id_colon = show_abbrev || !show_quotes; /* * Display the annotation's fields after the layout was * determined above. */ - pd_ann_check(show_ann); - if (opt_loglevel <= SR_LOG_WARN) { - pd_ann_check(!show_snum); - pd_ann_check(show_id_colon); - pd_ann_check(!show_class); - pd_ann_check(!show_quotes); - pd_ann_check(!show_abbrev); - /* Show only the longest annotation. */ - printf("%s: %s", pdata->pdo->proto_id, pda->ann_text[0]); - } else if (opt_loglevel >= SR_LOG_INFO) { - /* Sample numbers and quotes around the longest annotation. */ - pd_ann_check(show_snum); - printf("%"PRIu64"-%"PRIu64"", pdata->start_sample, pdata->end_sample); - if (opt_loglevel == SR_LOG_INFO) { - pd_ann_check(!show_id_colon); - pd_ann_check(!show_class); - pd_ann_check(show_quotes); - pd_ann_check(!show_abbrev); - printf(" %s \"%s\"", pdata->pdo->proto_id, pda->ann_text[0]); - } else { - pd_ann_check(show_id_colon); - pd_ann_check(show_class); - pd_ann_check(show_quotes); - pd_ann_check(show_abbrev); - /* Protocol decoder id, annotation class, - * all annotation strings. */ - ann_descr = g_slist_nth_data(dec->annotations, pda->ann_class); - printf(" %s: %s:", pdata->pdo->proto_id, ann_descr[0]); - for (i = 0; pda->ann_text[i]; i++) - printf(" \"%s\"", pda->ann_text[i]); - } + if (show_snum) { + printf("%" PRIu64 "-%" PRIu64 " ", + pdata->start_sample, pdata->end_sample); + } + printf("%s: ", pdata->pdo->proto_id); + if (show_class) { + ann_descr = g_slist_nth_data(dec->annotations, pda->ann_class); + printf("%s: ", ann_descr[0]); + } + quote = show_quotes ? "\"" : ""; + printf("%s%s%s", quote, pda->ann_text[0], quote); + if (show_abbrev) { + for (i = 1; pda->ann_text[i]; i++) + printf(" %s%s%s", quote, pda->ann_text[i], quote); } printf("\n"); fflush(stdout); @@ -532,7 +563,7 @@ void show_pd_meta(struct srd_proto_data *pdata, void *cb_data) /* Not in the list of PDs whose meta output we're showing. */ return; - if (opt_loglevel > SR_LOG_WARN) + if (opt_pd_samplenum || opt_loglevel > SR_LOG_WARN) printf("%"PRIu64"-%"PRIu64" ", pdata->start_sample, pdata->end_sample); printf("%s: ", pdata->pdo->proto_id); printf("%s: %s", pdata->pdo->meta_name, g_variant_print(pdata->data, FALSE));