static struct srd_session *srd_sess = NULL;
static GHashTable *pd_ann_visible = NULL;
static GHashTable *pd_meta_visible = NULL;
+static GHashTable *pd_binary_visible = NULL;
#endif
static GByteArray *savebuf;
static gchar *opt_pd_stack = NULL;
static gchar *opt_pd_annotations = NULL;
static gchar *opt_pd_meta = NULL;
+static gchar *opt_pd_binary = NULL;
#endif
static gchar *opt_input_format = NULL;
static gchar *opt_output_format = NULL;
"Protocol decoder annotation(s) to show", NULL},
{"protocol-decoder-meta", 'M', 0, G_OPTION_ARG_STRING, &opt_pd_meta,
"Protocol decoder meta output to show", NULL},
+ {"protocol-decoder-binary", 'B', 0, G_OPTION_ARG_STRING, &opt_pd_binary,
+ "Protocol decoder binary output to show", NULL},
#endif
{"scan", 0, 0, G_OPTION_ARG_NONE, &opt_scan_devs,
"Scan for devices", NULL},
(void)dev;
- ret = 0;
pd_ann_visible = g_hash_table_new_full(g_str_hash, g_int_equal,
g_free, NULL);
+ ret = 0;
pd_name = NULL;
pd_opthash = options = probes = NULL;
pdtokens = g_strsplit(pdstring, ",", 0);
*/
if (!opt_pd_annotations)
g_hash_table_insert(pd_ann_visible,
- g_strdup(di->inst_id), NULL);
+ g_strdup(di->inst_id), GINT_TO_POINTER(-1));
/* Remap the probes if needed. */
if (srd_inst_probe_set_all(di, probes) != SRD_OK) {
{
GSList *l;
struct srd_decoder *dec;
- int ann;
+ int ann_class;
char **pds, **pdtok, **keyval, **ann_descr;
/* Set up custom list of PDs and annotations to show. */
pds = g_strsplit(opt_pd_annotations, ",", 0);
for (pdtok = pds; *pdtok && **pdtok; pdtok++) {
- ann = 0;
keyval = g_strsplit(*pdtok, "=", 0);
if (!(dec = srd_decoder_get_by_id(keyval[0]))) {
g_critical("Protocol decoder '%s' not found.", keyval[0]);
g_critical("Protocol decoder '%s' has no annotations.", keyval[0]);
return 1;
}
+ ann_class = 0;
if (g_strv_length(keyval) == 2) {
- for (l = dec->annotations; l; l = l->next, ann++) {
+ for (l = dec->annotations; l; l = l->next, ann_class++) {
ann_descr = l->data;
if (!canon_cmp(ann_descr[0], keyval[1]))
/* Found it. */
"for protocol decoder '%s'.", keyval[1], keyval[0]);
return 1;
}
+ g_debug("cli: Showing protocol decoder %s annotation "
+ "class %d (%s).", keyval[0], ann_class, ann_descr[0]);
+ } else {
+ /* No class specified: show all of them. */
+ ann_class = -1;
+ g_debug("cli: Showing all annotation classes for protocol "
+ "decoder %s.", keyval[0]);
}
- g_debug("cli: Showing protocol decoder annotation %d from '%s'.", ann, keyval[0]);
- g_hash_table_insert(pd_ann_visible, g_strdup(keyval[0]), GINT_TO_POINTER(ann));
+ g_hash_table_insert(pd_ann_visible, g_strdup(keyval[0]), GINT_TO_POINTER(ann_class));
g_strfreev(keyval);
}
g_strfreev(pds);
return 0;
}
+int setup_pd_binary(void)
+{
+ GSList *l;
+ struct srd_decoder *dec;
+ int bin_class;
+ char **pds, **pdtok, **keyval, *bin_name;
+
+ pd_binary_visible = g_hash_table_new_full(g_str_hash, g_int_equal,
+ g_free, NULL);
+ pds = g_strsplit(opt_pd_binary, ",", 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]);
+ return 1;
+ }
+ if (!dec->binary) {
+ g_critical("Protocol decoder '%s' has no binary output.", keyval[0]);
+ return 1;
+ }
+ bin_class = 0;
+ if (g_strv_length(keyval) == 2) {
+ for (l = dec->binary; l; l = l->next, bin_class++) {
+ bin_name = l->data;
+ if (!canon_cmp(bin_name, keyval[1]))
+ /* Found it. */
+ break;
+ }
+ if (!l) {
+ g_critical("binary output '%s' not found "
+ "for protocol decoder '%s'.", keyval[1], keyval[0]);
+ return 1;
+ }
+ g_debug("cli: Showing protocol decoder %s binary class "
+ "%d (%s).", keyval[0], bin_class, bin_name);
+ } else {
+ /* No class specified: output all of them. */
+ bin_class = -1;
+ g_debug("cli: Showing all binary classes for protocol "
+ "decoder %s.", keyval[0]);
+ }
+ g_hash_table_insert(pd_binary_visible, g_strdup(keyval[0]), GINT_TO_POINTER(bin_class));
+ g_strfreev(keyval);
+ }
+ g_strfreev(pds);
+
+ return 0;
+}
+
void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data)
{
struct srd_proto_data_annotation *pda;
gpointer ann_format;
- int i;
+ int format;
/* 'cb_data' is not used in this specific callback. */
(void)cb_data;
/* Not in the list of PDs whose annotations we're showing. */
return;
+ format = GPOINTER_TO_INT(ann_format);
pda = pdata->data;
- if (pda->ann_format != GPOINTER_TO_INT(ann_format))
+ if (format != -1 && pda->ann_format != format)
/* We don't want this particular format from the PD. */
return;
if (opt_loglevel > SR_LOG_WARN)
printf("%"PRIu64"-%"PRIu64" ", pdata->start_sample, pdata->end_sample);
printf("%s: ", pdata->pdo->proto_id);
- for (i = 0; pda->ann_text[i]; i++)
- printf("\"%s\" ", pda->ann_text[i]);
+ /* Show only the longest annotation. */
+ printf("\"%s\" ", pda->ann_text[0]);
printf("\n");
fflush(stdout);
}
printf("\n");
fflush(stdout);
}
+
+void show_pd_binary(struct srd_proto_data *pdata, void *cb_data)
+{
+ struct srd_proto_data_binary *pdb;
+ gpointer classp;
+ int class;
+
+ /* 'cb_data' is not used in this specific callback. */
+ (void)cb_data;
+
+ if (!g_hash_table_lookup_extended(pd_binary_visible,
+ pdata->pdo->di->decoder->id, NULL, (void **)&classp))
+ /* Not in the list of PDs whose meta output we're showing. */
+ return;
+
+ class = GPOINTER_TO_INT(classp);
+ pdb = pdata->data;
+ if (class != -1 && class != pdb->bin_class)
+ /* Not showing this binary class. */
+ return;
+
+ /* Just send the binary output to stdout, no embellishments. */
+ fwrite(pdb->data, pdb->size, 1, stdout);
+ fflush(stdout);
+}
#endif
int setup_output_format(void)
}
if (register_pds(NULL, opt_pds) != 0)
goto done;
- if (srd_pd_output_callback_add(srd_sess, SRD_OUTPUT_ANN,
- show_pd_annotations, NULL) != SRD_OK)
- goto done;
if (setup_pd_stack() != 0)
goto done;
- if (opt_pd_annotations)
- if (setup_pd_annotations() != 0)
+
+ /* Only one output type is ever shown. */
+ if (opt_pd_binary) {
+ if (setup_pd_binary() != 0)
goto done;
- if (opt_pd_meta) {
+ if (srd_pd_output_callback_add(srd_sess, SRD_OUTPUT_BINARY,
+ show_pd_binary, NULL) != SRD_OK)
+ goto done;
+ } else if (opt_pd_meta) {
if (setup_pd_meta() != 0)
goto done;
if (srd_pd_output_callback_add(srd_sess, SRD_OUTPUT_META,
show_pd_meta, NULL) != SRD_OK)
goto done;
+ } else {
+ if (opt_pd_annotations)
+ if (setup_pd_annotations() != 0)
+ goto done;
+ if (srd_pd_output_callback_add(srd_sess, SRD_OUTPUT_ANN,
+ show_pd_annotations, NULL) != SRD_OK)
+ goto done;
}
}
#endif
projects / sigrok-cli.git / blobdiff