/*
* This file is part of the sigrok project.
*
- * Copyright (C) 2010 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
printf("Supported protocol decoders:\n");
for (l = srd_list_decoders(); l; l = l->next) {
dec = l->data;
- printf(" %-20s %s\n", dec->id, dec->desc);
+ printf(" %-20s %s\n", dec->id, dec->longname);
}
printf("\n");
demo_device = NULL;
for (l = devices; l; l = l->next) {
device = l->data;
- if (strstr(device->plugin->name, "demo")) {
+ if (sr_device_has_hwcap(device, SR_HWCAP_DEMO_DEVICE)) {
demo_device = device;
continue;
}
}
}
+static void show_pd_detail(void)
+{
+ GSList *l;
+ struct srd_decoder *dec;
+ char **pdtokens, **pdtok, **ann, *doc;
+
+ pdtokens = g_strsplit(opt_pds, ",", -1);
+ for (pdtok = pdtokens; *pdtok; pdtok++) {
+ if (!(dec = srd_get_decoder_by_id(*pdtok))) {
+ printf("Protocol decoder %s not found.", *pdtok);
+ return;
+ }
+ printf("ID: %s\nName: %s\nLong name: %s\nDescription: %s\n",
+ dec->id, dec->name, dec->longname, dec->desc);
+ printf("License: %s\n", dec->license);
+ if (dec->annotations) {
+ printf("Annotations:\n");
+ for (l = dec->annotations; l; l = l->next) {
+ ann = l->data;
+ printf("- %s\n %s\n", ann[0], ann[1]);
+ }
+ }
+ if ((doc = srd_decoder_doc(dec))) {
+ printf("Documentation:\n%s\n", doc[0] == '\n' ? doc+1 : doc);
+ g_free(doc);
+ }
+ }
+
+ g_strfreev(pdtokens);
+
+}
+
static void datafeed_in(struct sr_device *device, struct sr_datafeed_packet *packet)
{
static struct sr_output *o = NULL;
goto cleanup;
if (opt_pds) {
- if (srd_session_feed(packet->timeoffset, packet->duration,
- (uint8_t*)filter_out, filter_out_len) != SRD_OK)
+ if (srd_session_feed(received_samples, (uint8_t*)filter_out,
+ filter_out_len) != SRD_OK)
abort();
} else {
output_len = 0;
*/
static int register_pds(struct sr_device *device, const char *pdstring)
{
- gpointer dummy;
- char **pdtokens, **pdtok;
+ GHashTable *pd;
+ struct srd_decoder_instance *di;
+ char **pdtokens, **pdtok, *pd_name;
/* Avoid compiler warnings. */
(void)device;
g_datalist_init(&pd_ann_visible);
pdtokens = g_strsplit(pdstring, ",", -1);
+ pd = NULL;
+ pd_name = NULL;
- /* anything, but not NULL */
- dummy = register_pds;
for (pdtok = pdtokens; *pdtok; pdtok++) {
- struct srd_decoder_instance *di;
-
- /* Configure probes from command line */
- char **optokens, **optok;
- optokens = g_strsplit(*pdtok, ":", -1);
- di = srd_instance_new(optokens[0], NULL);
- if(!di) {
- fprintf(stderr, "Failed to instantiate PD: %s\n",
- optokens[0]);
- g_strfreev(optokens);
- g_strfreev(pdtokens);
- return -1;
- }
- g_datalist_set_data(&pd_ann_visible, optokens[0], dummy);
- for (optok = optokens+1; *optok; optok++) {
- char probe[strlen(*optok)];
- int num;
- if (sscanf(*optok, "%[^=]=%d", probe, &num) == 2) {
- printf("Setting probe '%s' to %d\n", probe, num);
- srd_instance_set_probe(di, probe, num);
- } else {
- fprintf(stderr, "Error: Couldn't parse decoder "
- "options correctly! Aborting.\n");
- /* FIXME: Better error handling. */
- exit(EXIT_FAILURE);
- }
+ if (!(pd = parse_generic_arg(*pdtok))) {
+ fprintf(stderr, "Invalid protocol decoder option '%s'.\n", *pdtok);
+ goto err_out;
}
- g_strfreev(optokens);
- /* TODO: Handle errors. */
+ pd_name = g_strdup(g_hash_table_lookup(pd, "sigrok_key"));
+ g_hash_table_remove(pd, "sigrok_key");
+ if (!(di = srd_instance_new(pd_name, pd))) {
+ fprintf(stderr, "Failed to instantiate PD %s\n", pd_name);
+ goto err_out;
+ }
+ g_datalist_set_data(&pd_ann_visible, pd_name, pd_name);
}
+ /* Any keys left in the options hash are probes, where the key
+ * is the probe name as specified in the decoder class, and the
+ * value is the probe number i.e. the order in which the PD's
+ * incoming samples are arranged. */
+ if (srd_instance_set_probes(di, pd) != SRD_OK)
+ return 1;
+
+err_out:
g_strfreev(pdtokens);
+ if (pd)
+ g_hash_table_destroy(pd);
+ if (pd_name)
+ g_free(pd_name);
return 0;
}
-void show_pd_annotation(struct srd_protocol_data *pdata)
+void show_pd_annotation(struct srd_proto_data *pdata)
{
int i;
- char **annotation;
+ char **annotations;
- annotation = pdata->data;
- if (pdata->annotation_format != 0) {
+ annotations = pdata->data;
+ if (pdata->ann_format != 0) {
/* CLI only shows the default annotation format */
return;
}
- if (!g_datalist_get_data(&pd_ann_visible, pdata->pdo->protocol_id)) {
+ if (!g_datalist_get_data(&pd_ann_visible, pdata->pdo->proto_id)) {
/* not in the list of PDs whose annotations we're showing */
return;
}
- printf("%s: ", pdata->pdo->protocol_id);
- for (i = 0; annotation[i]; i++)
- printf("\"%s\" ", annotation[i]);
+ if (opt_loglevel > SR_LOG_WARN)
+ printf("%"PRIu64"-%"PRIu64" ", pdata->start_sample, pdata->end_sample);
+ printf("%s: ", pdata->pdo->proto_id);
+ for (i = 0; annotations[i]; i++)
+ printf("\"%s\" ", annotations[i]);
printf("\n");
}
devices = sr_device_list();
for (l = devices; l; l = l->next) {
device = l->data;
- if (!strstr(device->plugin->name, "demo"))
+ if (!sr_device_has_hwcap(device, SR_HWCAP_DEMO_DEVICE))
num_devices++;
}
printf("Failed to register protocol decoders\n");
return 1;
}
- if (srd_register_callback(SRD_OUTPUT_ANNOTATION,
+ if (srd_register_callback(SRD_OUTPUT_ANN,
show_pd_annotation) != SRD_OK) {
printf("Failed to register protocol decoder callback\n");
return 1;
run_session();
else if (opt_device)
show_device_detail();
+ else if (opt_pds)
+ show_pd_detail();
else
printf("%s", g_option_context_get_help(context, TRUE, NULL));
projects / sigrok-cli.git / blobdiff