printf("sigrok-cli %s\n\n", VERSION);
+ printf("Using libsigrok %s (lib version %s).\n",
+ sr_package_version_string_get(), sr_lib_version_string_get());
+ printf("Using libsigrokdecode %s (lib version %s).\n\n",
+ srd_package_version_string_get(), srd_lib_version_string_get());
+
printf("Supported hardware drivers:\n");
drivers = sr_driver_list();
for (i = 0; drivers[i]; i++) {
printf("- %s\n %s\n", ann[0], ann[1]);
}
}
- if ((doc = srd_decoder_doc(dec))) {
+ if ((doc = srd_decoder_doc_get(dec))) {
printf("Documentation:\n%s\n", doc[0] == '\n' ? doc+1 : doc);
g_free(doc);
}
static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet)
{
static struct sr_output *o = NULL;
- static int probelist[SR_MAX_NUM_PROBES] = { 0 };
+ static int probelist[SR_MAX_NUM_PROBES + 1] = { 0 };
static uint64_t received_samples = 0;
static int unitsize = 0;
static int triggered = 0;
struct sr_datafeed_logic *logic;
int num_enabled_probes, sample_size, ret, i;
uint64_t output_len, filter_out_len;
- char *output_buf, *filter_out;
+ uint8_t *output_buf, *filter_out;
/* If the first packet to come in isn't a header, don't even try. */
if (packet->type != SR_DF_HEADER && o == NULL)
* 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_inst_probes_set(di, pd_opthash) != SRD_OK)
+ if (srd_inst_probe_set_all(di, pd_opthash) != SRD_OK)
goto err_out;
g_hash_table_destroy(pd_opthash);
pd_opthash = NULL;
printf("Failed to register protocol decoders\n");
return 1;
}
- if (srd_register_callback(SRD_OUTPUT_ANN,
+ if (srd_pd_output_callback_add(SRD_OUTPUT_ANN,
show_pd_annotation, NULL) != SRD_OK) {
printf("Failed to register protocol decoder callback\n");
return 1;
printf("Cannot stack protocol decoder '%s': instance not found.\n", pds[i]);
return 1;
}
- if ((ret = srd_inst_stack(di_from, di_to) != SRD_OK))
+ if ((ret = srd_inst_stack(di_from, di_to)) != SRD_OK)
return ret;
/* Don't show annotation from this PD. Only the last PD in