X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=decode.c;h=1ba5ef20ec80781de8ba3f3c0fa46a730ea6a7e3;hp=8a52edac4aea5610b3443f1bcd59869f1a9d5a6a;hb=c45dd41c508bd84b3886eebfa0ca4b2230b2630b;hpb=e9e4dc4d7ecc678cffaa9a93034319f7e02f33b9 diff --git a/decode.c b/decode.c index 8a52eda..1ba5ef2 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)); @@ -179,7 +191,7 @@ static int register_pd(char *opt_pds, char *opt_pd_annotations) * in the stack. */ if (!opt_pd_annotations) { - g_hash_table_insert(pd_ann_visible, g_strdup(di->inst_id), + g_hash_table_insert(pd_ann_visible, g_strdup(di->decoder->id), g_slist_append(NULL, GINT_TO_POINTER(-1))); } if (di_prior) { @@ -194,6 +206,10 @@ static int register_pd(char *opt_pds, char *opt_pd_annotations) g_hash_table_remove(pd_ann_visible, di_prior->inst_id); } di_prior = di; + g_free(pd_name); + g_hash_table_destroy(pd_opthash); + g_hash_table_destroy(options); + pd_opthash = options = NULL; } if (pd_opthash) @@ -204,7 +220,6 @@ static int register_pd(char *opt_pds, char *opt_pd_annotations) g_hash_table_destroy(channels); g_strfreev(pdtokens); - g_free(pd_name); return ret; } @@ -272,6 +287,7 @@ static void map_pd_inst_channels(void *key, void *value, void *user_data) } srd_inst_channel_set_all(di, channel_indices); + g_hash_table_destroy(channel_indices); } void map_pd_channels(struct sr_dev_inst *sdi) @@ -419,47 +435,75 @@ 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; if (!pd_ann_visible) return; - if (!g_hash_table_lookup_extended(pd_ann_visible, pdata->pdo->di->inst_id, - NULL, (void **)&ann_list)) + if (!g_hash_table_lookup_extended(pd_ann_visible, pdata->pdo->di->decoder->id, + NULL, (void **)&ann_list)) { /* Not in the list of PDs whose annotations we're showing. */ return; + } 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); @@ -474,7 +518,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)); @@ -486,7 +530,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; @@ -495,9 +539,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;