X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=decode.c;h=bf6fc2fc772985425d5779437bcfd1d941aa433b;hb=8f72edc3522b73ce55677e3ac4d7701726e574fd;hp=2bcc0ae13f53306a2743abc7e692695523a5eff9;hpb=10d4fc25bfd67dbd7b457851d6c8a1dc8b031b39;p=sigrok-cli.git diff --git a/decode.c b/decode.c index 2bcc0ae..bf6fc2f 100644 --- a/decode.c +++ b/decode.c @@ -38,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; @@ -53,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)); @@ -305,10 +317,14 @@ int setup_pd_annotations(char *opt_pd_annotations) keyval = g_strsplit(*pdtok, "=", 0); if (!(dec = srd_decoder_get_by_id(keyval[0]))) { g_critical("Protocol decoder '%s' not found.", keyval[0]); + g_strfreev(keyval); + g_strfreev(pds); return 1; } if (!dec->annotations) { g_critical("Protocol decoder '%s' has no annotations.", keyval[0]); + g_strfreev(keyval); + g_strfreev(pds); return 1; } if (g_strv_length(keyval) == 2 && keyval[1][0] != '\0') { @@ -324,6 +340,8 @@ int setup_pd_annotations(char *opt_pd_annotations) if (!l) { g_critical("Annotation '%s' not found " "for protocol decoder '%s'.", *ann, keyval[0]); + g_strfreev(keyval); + g_strfreev(pds); return 1; } l_ann = g_hash_table_lookup(pd_ann_visible, keyval[0]); @@ -423,7 +441,8 @@ void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data) GSList *ann_list, *l; int i; char **ann_descr; - gboolean show; + gboolean show_ann, show_snum, show_class, show_quotes, show_abbrev; + const char *quote; (void)cb_data; @@ -438,33 +457,59 @@ void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data) dec = pdata->pdo->di->decoder; pda = pdata->data; - show = FALSE; + show_ann = FALSE; for (l = ann_list; l; l = l->next) { if (GPOINTER_TO_INT(l->data) == -1 || GPOINTER_TO_INT(l->data) == pda->ann_class) { - show = TRUE; + show_ann = TRUE; break; } } - if (!show) + if (!show_ann) return; - if (opt_loglevel <= SR_LOG_WARN) { - /* 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. */ - printf("%"PRIu64"-%"PRIu64"", pdata->start_sample, pdata->end_sample); - if (opt_loglevel == SR_LOG_INFO) { - printf(" %s \"%s\"", pdata->pdo->proto_id, pda->ann_text[0]); - } else { - /* 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]); - } + /* + * 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. + * - Always show the longest annotation text. + * - Optionally show alternative annotation text (abbreviations + * for different zoom levels). + * - Optionally put quote marks around annotation text, when + * recipients might have to deal with a set of text variants. + */ + show_snum = show_class = show_quotes = show_abbrev = FALSE; + if (opt_pd_samplenum || opt_loglevel > SR_LOG_WARN) { + show_snum = TRUE; + } + if (opt_loglevel > SR_LOG_WARN) { + show_quotes = TRUE; + } + if (opt_loglevel > SR_LOG_INFO) { + show_class = TRUE; + show_abbrev = TRUE; + } + + /* + * Display the annotation's fields after the layout was + * determined above. + */ + 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); @@ -479,7 +524,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)); @@ -491,7 +536,7 @@ void show_pd_binary(struct srd_proto_data *pdata, void *cb_data) { struct srd_proto_data_binary *pdb; gpointer classp; - int class; + int classi; (void)cb_data; @@ -500,9 +545,9 @@ void show_pd_binary(struct srd_proto_data *pdata, void *cb_data) /* Not in the list of PDs whose meta output we're showing. */ return; - class = GPOINTER_TO_INT(classp); + classi = GPOINTER_TO_INT(classp); pdb = pdata->data; - if (class != -1 && class != pdb->bin_class) + if (classi != -1 && classi != pdb->bin_class) /* Not showing this binary class. */ return;