* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <stdlib.h>
+#include <string.h>
+#include <glib.h>
#include "sigrok-cli.h"
#include "config.h"
-#include <glib.h>
#ifdef HAVE_SRD
static GHashTable *pd_ann_visible = 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)
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.
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.
*/
g_hash_table_destroy(options);
if (channels)
g_hash_table_destroy(channels);
- if (pd_name)
- g_free(pd_name);
+ g_free(pd_name);
return ret;
}
void map_pd_channels(struct sr_dev_inst *sdi)
{
+ GSList *channels;
+
+ channels = sr_dev_inst_channels_get(sdi);
+
if (pd_channel_maps) {
g_hash_table_foreach(pd_channel_maps, &map_pd_inst_channels,
- sdi->channels);
+ channels);
g_hash_table_destroy(pd_channel_maps);
pd_channel_maps = NULL;
}
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).
*/
char **ann_descr;
gboolean show;
- /* 'cb_data' is not used in this specific callback. */
(void)cb_data;
if (!pd_ann_visible)
show = FALSE;
for (l = ann_list; l; l = l->next) {
if (GPOINTER_TO_INT(l->data) == -1
- || GPOINTER_TO_INT(l->data) == pda->ann_format) {
+ || GPOINTER_TO_INT(l->data) == pda->ann_class) {
show = TRUE;
break;
}
} 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]);
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,
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,
fflush(stdout);
}
#endif
-