printf("\n");
/* TODO: Error handling. */
- srd_init();
+ srd_init(NULL);
printf("Supported protocol decoders:\n");
for (l = srd_list_decoders(); l; l = l->next) {
{
const struct sr_device_instance *sdi;
- sr_device_get_info(device, SR_DI_INSTANCE, (const void **) &sdi);
+ sr_device_get_info(device, SR_DI_INSTANCE, (const void **)&sdi);
if (sdi->vendor && sdi->vendor[0])
printf("%s ", sdi->vendor);
print_device_line(device);
if (sr_device_get_info(device, SR_DI_TRIGGER_TYPES,
- (const void **) &charopts) == SR_OK) {
+ (const void **)&charopts) == SR_OK) {
printf("Supported triggers: ");
while (*charopts) {
printf("%c ", *charopts);
if (hwo->capability == SR_HWCAP_PATTERN_MODE) {
printf(" %s", hwo->shortname);
if (sr_device_get_info(device, SR_DI_PATTERNMODES,
- (const void **) &stropts) == SR_OK) {
+ (const void **)&stropts) == SR_OK) {
printf(" - supported modes:\n");
for (i = 0; stropts[i]; i++)
printf(" %s\n", stropts[i]);
printf(" %s", hwo->shortname);
/* Supported samplerates */
if (sr_device_get_info(device, SR_DI_SAMPLERATES,
- (const void **) &samplerates) != SR_OK) {
+ (const void **)&samplerates) != SR_OK) {
printf("\n");
continue;
}
if (!(s = sr_samplerate_string(samplerates->low)))
continue;
printf(" (%s", s);
- free(s);
+ g_free(s);
/* high */
if (!(s = sr_samplerate_string(samplerates->high)))
continue;
printf(" - %s", s);
- free(s);
+ g_free(s);
/* step */
if (!(s = sr_samplerate_string(samplerates->step)))
continue;
printf(" in steps of %s)\n", s);
- free(s);
+ g_free(s);
} else {
printf(" - supported samplerates:\n");
for (i = 0; samplerates->list[i]; i++) {
case SR_DF_HEADER:
g_message("cli: Received SR_DF_HEADER");
/* Initialize the output module. */
- if (!(o = malloc(sizeof(struct sr_output)))) {
+ if (!(o = g_try_malloc(sizeof(struct sr_output)))) {
printf("Output module malloc failed.\n");
exit(1);
}
if (output_len) {
if (outfile)
fwrite(output_buf, 1, output_len, outfile);
- free(output_buf);
+ g_free(output_buf);
output_len = 0;
}
}
sr_session_halt();
if (outfile && outfile != stdout)
fclose(outfile);
- free(o);
+ g_free(o);
o = NULL;
break;
case SR_DF_TRIGGER:
o->format->data(o, filter_out, filter_out_len, &output_buf, &output_len);
if (output_len) {
fwrite(output_buf, 1, output_len, outfile);
- free(output_buf);
+ g_free(output_buf);
}
}
static int register_pds(struct sr_device *device, const char *pdstring)
{
GHashTable *pd_opthash;
- struct srd_decoder_instance *di;
+ struct srd_decoder_inst *di;
char **pdtokens, **pdtok, *pd_name;
/* Avoid compiler warnings. */
pd_name = g_strdup(g_hash_table_lookup(pd_opthash, "sigrok_key"));
g_hash_table_remove(pd_opthash, "sigrok_key");
- if (!(di = srd_instance_new(pd_name, pd_opthash))) {
+ if (!(di = srd_inst_new(pd_name, pd_opthash))) {
fprintf(stderr, "Failed to instantiate PD %s\n", pd_name);
goto err_out;
}
- g_datalist_set_data(&pd_ann_visible, di->instance_id, pd_name);
+ g_datalist_set_data(&pd_ann_visible, di->inst_id, 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_opthash) != SRD_OK)
+ if (srd_inst_set_probes(di, pd_opthash) != SRD_OK)
goto err_out;
g_hash_table_destroy(pd_opthash);
pd_opthash = NULL;
return 0;
}
-void show_pd_annotation(struct srd_proto_data *pdata)
+void show_pd_annotation(struct srd_proto_data *pdata, void *user_data)
{
int i;
char **annotations;
+ /* 'user_data' is not used in this specific callback. */
+ (void)user_data;
+
if (pdata->ann_format != 0) {
/* CLI only shows the default annotation format. */
return;
}
- if (!g_datalist_get_data(&pd_ann_visible, pdata->pdo->di->instance_id)) {
+ if (!g_datalist_get_data(&pd_ann_visible, pdata->pdo->di->inst_id)) {
/* Not in the list of PDs whose annotations we're showing. */
return;
}
}
/* Initialize the input module. */
- if (!(in = malloc(sizeof(struct sr_input)))) {
+ if (!(in = g_try_malloc(sizeof(struct sr_input)))) {
printf("Failed to allocate input module.\n");
exit(1);
}
const uint64_t *samplerate;
sr_device_get_info(device, SR_DI_CUR_SAMPLERATE,
- (const void **) &samplerate);
- limit_samples = (*samplerate) * time_msec / (uint64_t) 1000;
+ (const void **)&samplerate);
+ limit_samples = (*samplerate) * time_msec / (uint64_t)1000;
}
if (limit_samples == 0) {
printf("Not enough time at this samplerate.\n");
GHashTableIter iter;
gpointer key, value;
struct sr_output_format **outputs;
- struct srd_decoder_instance *di_from, *di_to;
+ struct srd_decoder_inst *di_from, *di_to;
int i, ret;
char *fmtspec, **pds;
return 1;
if (opt_pds) {
- if (srd_init() != SRD_OK) {
+ if (srd_init(NULL) != SRD_OK) {
printf("Failed to initialize sigrokdecode\n");
return 1;
}
return 1;
}
if (srd_register_callback(SRD_OUTPUT_ANN,
- show_pd_annotation) != SRD_OK) {
+ show_pd_annotation, NULL) != SRD_OK) {
printf("Failed to register protocol decoder callback\n");
return 1;
}
return 1;
}
- if (!(di_from = srd_instance_find_by_id(pds[0]))) {
+ if (!(di_from = srd_inst_find_by_id(pds[0]))) {
printf("Cannot stack protocol decoder '%s': instance not found.\n", pds[0]);
return 1;
}
for (i = 1; pds[i]; i++) {
- if (!(di_to = srd_instance_find_by_id(pds[i]))) {
+ if (!(di_to = srd_inst_find_by_id(pds[i]))) {
printf("Cannot stack protocol decoder '%s': instance not found.\n", pds[i]);
return 1;
}
- if ((ret = srd_instance_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
* the stack will be left on the annotation list.
*/
- g_datalist_remove_data(&pd_ann_visible, di_from->instance_id);
+ g_datalist_remove_data(&pd_ann_visible, di_from->inst_id);
di_from = di_to;
}