X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=decode.c;h=e2a0f8563524447982d19f71381bb9fa99c01fef;hp=63679d4be5028f30b72d2aa9326a1b1e2ed5a77e;hb=ee639fb40fa43aa3553ef0229def9bcdb8338c2b;hpb=39aedc34ab864e95a395558f8b8d4be3beb11371;ds=sidebyside
diff --git a/decode.c b/decode.c
index 63679d4..e2a0f85 100644
--- a/decode.c
+++ b/decode.c
@@ -17,19 +17,19 @@
* along with this program. If not, see .
*/
+#include
+#include
+#include
#include "sigrok-cli.h"
#include "config.h"
-#include
#ifdef HAVE_SRD
static GHashTable *pd_ann_visible = NULL;
static GHashTable *pd_meta_visible = NULL;
static GHashTable *pd_binary_visible = NULL;
-static GHashTable *pd_probe_maps = NULL;
+static GHashTable *pd_channel_maps = NULL;
extern struct srd_session *srd_sess;
-extern gint opt_loglevel;
-
static int opts_to_gvar(struct srd_decoder *dec, GHashTable *hash,
GHashTable **options)
@@ -88,28 +88,29 @@ static int move_hash_element(GHashTable *src, GHashTable *dest, void *key)
return TRUE;
}
-static GHashTable *extract_probe_map(struct srd_decoder *dec, GHashTable *hash)
+static GHashTable *extract_channel_map(struct srd_decoder *dec, GHashTable *hash)
{
- GHashTable *probe_map;
- struct srd_probe *p;
+ GHashTable *channel_map;
+ struct srd_channel *pdch;
GSList *l;
- probe_map = g_hash_table_new_full(g_str_hash, g_str_equal,
+ channel_map = g_hash_table_new_full(g_str_hash, g_str_equal,
g_free, g_free);
- for (l = dec->probes; l; l = l->next) {
- p = l->data;
- move_hash_element(hash, probe_map, p->id);
+ for (l = dec->channels; l; l = l->next) {
+ pdch = l->data;
+ move_hash_element(hash, channel_map, pdch->id);
}
- for (l = dec->opt_probes; l; l = l->next) {
- p = l->data;
- move_hash_element(hash, probe_map, p->id);
+ for (l = dec->opt_channels; l; l = l->next) {
+ pdch = l->data;
+ move_hash_element(hash, channel_map, pdch->id);
}
- return probe_map;
+ return channel_map;
}
-/* Register the given PDs for this session.
+/*
+ * Register the given PDs for this session.
* Accepts a string of the form: "spi:sck=3:sdata=4,spi:sck=3:sdata=5"
* That will instantiate two SPI decoders on the clock but different data
* lines.
@@ -117,7 +118,7 @@ static GHashTable *extract_probe_map(struct srd_decoder *dec, GHashTable *hash)
int register_pds(const char *opt_pds, char *opt_pd_annotations)
{
struct srd_decoder *dec;
- GHashTable *pd_opthash, *options, *probes;
+ GHashTable *pd_opthash, *options, *channels;
GList *leftover, *l;
struct srd_decoder_inst *di;
int ret;
@@ -125,11 +126,9 @@ int register_pds(const char *opt_pds, char *opt_pd_annotations)
pd_ann_visible = g_hash_table_new_full(g_str_hash, g_str_equal,
g_free, NULL);
- pd_probe_maps = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
- (GDestroyNotify)g_hash_table_destroy);
ret = 0;
pd_name = NULL;
- pd_opthash = options = probes = NULL;
+ pd_opthash = options = channels = pd_channel_maps = NULL;
pdtokens = g_strsplit(opt_pds, ",", 0);
for (pdtok = pdtokens; *pdtok; pdtok++) {
if (!(pd_opthash = parse_generic_arg(*pdtok, TRUE))) {
@@ -144,19 +143,23 @@ int register_pds(const char *opt_pds, char *opt_pd_annotations)
ret = 1;
break;
}
- dec = srd_decoder_get_by_id(pd_name);
+ if (!(dec = srd_decoder_get_by_id(pd_name))) {
+ g_critical("Failed to get decoder %s by id.", pd_name);
+ ret = 1;
+ break;
+ }
- /* Convert decoder option and probe values to GVariant. */
+ /* Convert decoder option and channel values to GVariant. */
if (!opts_to_gvar(dec, pd_opthash, &options)) {
ret = 1;
break;
}
- probes = extract_probe_map(dec, pd_opthash);
+ channels = extract_channel_map(dec, pd_opthash);
if (g_hash_table_size(pd_opthash) > 0) {
leftover = g_hash_table_get_keys(pd_opthash);
for (l = leftover; l; l = l->next)
- g_critical("Unknown option or probe '%s'", (char *)l->data);
+ g_critical("Unknown option or channel '%s'", (char *)l->data);
g_list_free(leftover);
break;
}
@@ -167,17 +170,25 @@ int register_pds(const char *opt_pds, char *opt_pd_annotations)
break;
}
- /* Save the probe setup for later. */
- g_hash_table_insert(pd_probe_maps, g_strdup(di->inst_id), probes);
- probes = NULL;
+ if (pdtok == pdtokens) {
+ /*
+ * Save the channel setup for later, but only on the
+ * first decoder (stacked decoders don't get channels).
+ */
+ pd_channel_maps = g_hash_table_new_full(g_str_hash,
+ g_str_equal, g_free, (GDestroyNotify)g_hash_table_destroy);
+ g_hash_table_insert(pd_channel_maps, g_strdup(di->inst_id), channels);
+ channels = NULL;
+ }
- /* If no annotation list was specified, add them all in now.
+ /*
+ * If no annotation list was specified, add them all in now.
* This will be pared down later to leave only the last PD
* in the stack.
*/
if (!opt_pd_annotations)
- g_hash_table_insert(pd_ann_visible,
- g_strdup(di->inst_id), GINT_TO_POINTER(-1));
+ g_hash_table_insert(pd_ann_visible, g_strdup(di->inst_id),
+ g_slist_append(NULL, GINT_TO_POINTER(-1)));
}
g_strfreev(pdtokens);
@@ -185,29 +196,27 @@ int register_pds(const char *opt_pds, char *opt_pd_annotations)
g_hash_table_destroy(pd_opthash);
if (options)
g_hash_table_destroy(options);
- if (probes)
- g_hash_table_destroy(probes);
- if (pd_name)
- g_free(pd_name);
+ if (channels)
+ g_hash_table_destroy(channels);
+ g_free(pd_name);
return ret;
}
-static void map_pd_inst_probes(void *key, void *value, void *user_data)
+static void map_pd_inst_channels(void *key, void *value, void *user_data)
{
- GHashTable *probe_map;
- GHashTable *probe_indices;
- GSList *probe_list;
+ GHashTable *channel_map;
+ GHashTable *channel_indices;
+ GSList *channel_list;
struct srd_decoder_inst *di;
GVariant *var;
- void *probe_id;
- void *probe_target;
- struct sr_probe *probe;
+ void *channel_id;
+ void *channel_target;
+ struct sr_channel *ch;
GHashTableIter iter;
- int num_probes;
- probe_map = value;
- probe_list = user_data;
+ channel_map = value;
+ channel_list = user_data;
di = srd_inst_find_by_id(srd_sess, key);
if (!di) {
@@ -215,41 +224,40 @@ static void map_pd_inst_probes(void *key, void *value, void *user_data)
(char *)key);
return;
}
- probe_indices = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
+ channel_indices = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
(GDestroyNotify)g_variant_unref);
- g_hash_table_iter_init(&iter, probe_map);
- while (g_hash_table_iter_next(&iter, &probe_id, &probe_target)) {
- probe = find_probe(probe_list, probe_target);
- if (!probe) {
- g_printerr("cli: No probe with name \"%s\" found.\n",
- (char *)probe_target);
+ g_hash_table_iter_init(&iter, channel_map);
+ while (g_hash_table_iter_next(&iter, &channel_id, &channel_target)) {
+ ch = find_channel(channel_list, channel_target);
+ if (!ch) {
+ g_printerr("cli: No channel with name \"%s\" found.\n",
+ (char *)channel_target);
continue;
}
- if (probe->enabled)
- g_printerr("cli: Mapping probe \"%s\" to \"%s\" "
- "(index %d).\n", (char *)probe_id,
- (char *)probe_target, probe->index);
- else
- g_printerr("cli: Target probe \"%s\" not enabled.\n",
- (char *)probe_target);
-
- var = g_variant_new_int32(probe->index);
+ if (!ch->enabled)
+ g_printerr("cli: Target channel \"%s\" not enabled.\n",
+ (char *)channel_target);
+
+ var = g_variant_new_int32(ch->index);
g_variant_ref_sink(var);
- g_hash_table_insert(probe_indices, g_strdup(probe_id), var);
+ g_hash_table_insert(channel_indices, g_strdup(channel_id), var);
}
- num_probes = g_slist_length(probe_list);
- srd_inst_probe_set_all(di, probe_indices, (num_probes + 7) / 8);
+ srd_inst_channel_set_all(di, channel_indices);
}
-void map_pd_probes(struct sr_dev_inst *sdi)
+void map_pd_channels(struct sr_dev_inst *sdi)
{
- if (pd_probe_maps) {
- g_hash_table_foreach(pd_probe_maps, &map_pd_inst_probes,
- sdi->probes);
- g_hash_table_destroy(pd_probe_maps);
- pd_probe_maps = NULL;
+ GSList *channels;
+
+ channels = sr_dev_inst_channels_get(sdi);
+
+ if (pd_channel_maps) {
+ g_hash_table_foreach(pd_channel_maps, &map_pd_inst_channels,
+ channels);
+ g_hash_table_destroy(pd_channel_maps);
+ pd_channel_maps = NULL;
}
}
@@ -296,13 +304,13 @@ int setup_pd_stack(char *opt_pds, char *opt_pd_stack, char *opt_pd_annotations)
if ((ret = srd_inst_stack(srd_sess, di_from, di_to)) != SRD_OK)
return 1;
- /* Don't show annotation from this PD. Only the last PD in
+ /*
+ * Don't show annotation from this PD. Only the last PD in
* the stack will be left on the annotation list (unless
* the annotation list was specifically provided).
*/
if (!opt_pd_annotations)
- g_hash_table_remove(pd_ann_visible,
- di_from->inst_id);
+ g_hash_table_remove(pd_ann_visible, di_from->inst_id);
di_from = di_to;
}
@@ -314,10 +322,10 @@ int setup_pd_stack(char *opt_pds, char *opt_pd_stack, char *opt_pd_annotations)
int setup_pd_annotations(char *opt_pd_annotations)
{
- GSList *l;
+ GSList *l, *l_ann;
struct srd_decoder *dec;
int ann_class;
- char **pds, **pdtok, **keyval, **ann_descr;
+ char **pds, **pdtok, **keyval, **annlist, **ann, **ann_descr;
/* Set up custom list of PDs and annotations to show. */
pds = g_strsplit(opt_pd_annotations, ",", 0);
@@ -331,28 +339,34 @@ int setup_pd_annotations(char *opt_pd_annotations)
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_class++) {
- ann_descr = l->data;
- if (!canon_cmp(ann_descr[0], keyval[1]))
- /* Found it. */
- break;
- }
- if (!l) {
- g_critical("Annotation '%s' not found "
- "for protocol decoder '%s'.", keyval[1], keyval[0]);
- return 1;
+ if (g_strv_length(keyval) == 2 && keyval[1][0] != '\0') {
+ annlist = g_strsplit(keyval[1], ":", 0);
+ for (ann = annlist; *ann && **ann; ann++) {
+ ann_class = 0;
+ for (l = dec->annotations; l; l = l->next, ann_class++) {
+ ann_descr = l->data;
+ if (!canon_cmp(ann_descr[0], *ann))
+ /* Found it. */
+ break;
+ }
+ if (!l) {
+ g_critical("Annotation '%s' not found "
+ "for protocol decoder '%s'.", *ann, keyval[0]);
+ return 1;
+ }
+ 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]);
}
- 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_hash_table_insert(pd_ann_visible, g_strdup(keyval[0]),
+ g_slist_append(NULL, GINT_TO_POINTER(-1)));
g_debug("cli: Showing all annotation classes for protocol "
"decoder %s.", keyval[0]);
}
- g_hash_table_insert(pd_ann_visible, g_strdup(keyval[0]), GINT_TO_POINTER(ann_class));
g_strfreev(keyval);
}
g_strfreev(pds);
@@ -434,26 +448,32 @@ void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data)
{
struct srd_decoder *dec;
struct srd_proto_data_annotation *pda;
- gpointer ann_format;
- int format, i;
+ GSList *ann_list, *l;
+ int i;
char **ann_descr;
+ gboolean show;
- /* 'cb_data' is not used in this specific callback. */
(void)cb_data;
if (!pd_ann_visible)
return;
if (!g_hash_table_lookup_extended(pd_ann_visible, pdata->pdo->di->inst_id,
- NULL, &ann_format))
+ NULL, (void **)&ann_list))
/* Not in the list of PDs whose annotations we're showing. */
return;
- format = GPOINTER_TO_INT(ann_format);
dec = pdata->pdo->di->decoder;
pda = pdata->data;
- if (format != -1 && pda->ann_format != format)
- /* We don't want this particular format from the PD. */
+ show = 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;
+ break;
+ }
+ }
+ if (!show)
return;
if (opt_loglevel <= SR_LOG_WARN) {
@@ -467,7 +487,7 @@ void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data)
} else {
/* Protocol decoder id, annotation class,
* all annotation strings. */
- ann_descr = g_slist_nth_data(dec->annotations, pda->ann_format);
+ 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]);
@@ -479,8 +499,6 @@ void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data)
void show_pd_meta(struct srd_proto_data *pdata, void *cb_data)
{
-
- /* 'cb_data' is not used in this specific callback. */
(void)cb_data;
if (!g_hash_table_lookup_extended(pd_meta_visible,
@@ -502,7 +520,6 @@ void show_pd_binary(struct srd_proto_data *pdata, void *cb_data)
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,
@@ -521,4 +538,3 @@ void show_pd_binary(struct srd_proto_data *pdata, void *cb_data)
fflush(stdout);
}
#endif
-