static void datafeed_in(struct sr_device *device, struct sr_datafeed_packet *packet)
{
static struct sr_output *o = NULL;
- static int probelist[65] = { 0 };
+ static int probelist[SR_MAX_NUM_PROBES] = { 0 };
static uint64_t received_samples = 0;
static int unitsize = 0;
static int triggered = 0;
}
}
if (opt_pds)
- srd_session_start(device->plugin->name, unitsize,
- time(NULL), header->samplerate);
+ srd_session_start(num_enabled_probes, unitsize,
+ header->samplerate);
break;
case SR_DF_END:
g_message("cli: Received SR_DF_END");
for (optok = optokens+1; *optok; optok++) {
char probe[strlen(*optok)];
int num;
- if(sscanf(*optok, "%[^=]=%d", probe, &num) == 2)
+ if (sscanf(*optok, "%[^=]=%d", probe, &num) == 2) {
+ printf("Setting probe '%s' to %d\n", probe, num);
srd_instance_set_probe(di, probe, num);
- /* TODO: else fail somehow */
+ } else {
+ fprintf(stderr, "Error: Couldn't parse decoder "
+ "options correctly! Aborting.\n");
+ /* FIXME: Better error handling. */
+ exit(EXIT_FAILURE);
+ }
}
g_strfreev(optokens);
return 0;
}
+void show_pd_annotation(struct srd_protocol_data *pdata)
+{
+ int i;
+ char **annotation;
+
+ annotation = pdata->data;
+ if (pdata->annotation_format != 0) {
+ /* CLI only shows the default annotation format */
+ return;
+ }
+
+ printf("%s: ", pdata->pdo->protocol_id);
+ for (i = 0; annotation[i]; i++)
+ printf("\"%s\" ", annotation[i]);
+ printf("\n");
+
+}
+
static int select_probes(struct sr_device *device)
{
struct sr_probe *probe;
return 1;
if (opt_pds) {
- /* TODO: Error handling. */
- srd_init();
- register_pds(NULL, opt_pds);
+ if (srd_init() != SRD_OK) {
+ printf("Failed to initialize sigrokdecode\n");
+ return 1;
+ }
+ if (register_pds(NULL, opt_pds) != 0) {
+ printf("Failed to register protocol decoders\n");
+ return 1;
+ }
+ if (srd_register_callback(SRD_OUTPUT_ANNOTATION,
+ show_pd_annotation) != SRD_OK) {
+ printf("Failed to register protocol decoder callback\n");
+ return 1;
+ }
}
if (!opt_format) {