printf("sigrok-cli %s\n\n", VERSION);
printf("Supported hardware drivers:\n");
- plugins = sr_list_hwplugins();
+ plugins = sr_hwplugins_list();
for (p = plugins; p; p = p->next) {
plugin = p->data;
printf(" %-20s %s\n", plugin->name, plugin->longname);
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_dev_get_info(device, SR_DI_INSTANCE, (const void **)&sdi);
if (sdi->vendor && sdi->vendor[0])
printf("%s ", sdi->vendor);
int devcnt;
devcnt = 0;
- devices = sr_device_list();
+ devices = sr_dev_list();
if (g_slist_length(devices) == 0)
return;
demo_device = NULL;
for (l = devices; l; l = l->next) {
device = l->data;
- if (sr_device_has_hwcap(device, SR_HWCAP_DEMO_DEVICE)) {
+ if (sr_dev_has_hwcap(device, SR_HWCAP_DEMO_DEVICE)) {
demo_device = device;
continue;
}
print_device_line(device);
- if (sr_device_get_info(device, SR_DI_TRIGGER_TYPES,
- (const void **) &charopts) == SR_OK) {
+ if (sr_dev_get_info(device, SR_DI_TRIGGER_TYPES,
+ (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) {
+ if (sr_dev_get_info(device, SR_DI_PATTERNMODES,
+ (const void **)&stropts) == SR_OK) {
printf(" - supported modes:\n");
for (i = 0; stropts[i]; i++)
printf(" %s\n", stropts[i]);
} else if (hwo->capability == SR_HWCAP_SAMPLERATE) {
printf(" %s", hwo->shortname);
/* Supported samplerates */
- if (sr_device_get_info(device, SR_DI_SAMPLERATES,
- (const void **) &samplerates) != SR_OK) {
+ if (sr_dev_get_info(device, SR_DI_SAMPLERATES,
+ (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);
}
}
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;
for (i = 0; i < max_probes; i++) {
if (probelist[i]) {
- sr_device_probe_name(device, i + 1, probelist[i]);
+ sr_dev_probe_name(device, i + 1, probelist[i]);
g_free(probelist[i]);
} else {
- probe = sr_device_probe_find(device, i + 1);
+ probe = sr_dev_probe_find(device, i + 1);
probe->enabled = FALSE;
}
}
}
/* 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);
}
int num_devices;
num_devices = 0;
- devices = sr_device_list();
+ devices = sr_dev_list();
for (l = devices; l; l = l->next) {
device = l->data;
- if (!sr_device_has_hwcap(device, SR_HWCAP_DEMO_DEVICE))
+ if (!sr_dev_has_hwcap(device, SR_HWCAP_DEMO_DEVICE))
num_devices++;
}
if (opt_continuous) {
capabilities = device->plugin->get_capabilities();
- if (!sr_find_hwcap(capabilities, SR_HWCAP_CONTINUOUS)) {
+ if (!sr_has_hwcap(capabilities, SR_HWCAP_CONTINUOUS)) {
printf("This device does not support continuous sampling.");
sr_session_destroy();
return;
max_probes = g_slist_length(device->probes);
for (i = 0; i < max_probes; i++) {
if (probelist[i]) {
- sr_device_trigger_set(device, i + 1, probelist[i]);
+ sr_dev_trigger_set(device, i + 1, probelist[i]);
g_free(probelist[i]);
}
}
}
capabilities = device->plugin->get_capabilities();
- if (sr_find_hwcap(capabilities, SR_HWCAP_LIMIT_MSEC)) {
+ if (sr_has_hwcap(capabilities, SR_HWCAP_LIMIT_MSEC)) {
if (device->plugin->set_configuration(device->plugin_index,
SR_HWCAP_LIMIT_MSEC, &time_msec) != SR_OK) {
printf("Failed to configure time limit.\n");
* convert to samples based on the samplerate.
*/
limit_samples = 0;
- if (sr_device_has_hwcap(device, SR_HWCAP_SAMPLERATE)) {
+ if (sr_dev_has_hwcap(device, SR_HWCAP_SAMPLERATE)) {
const uint64_t *samplerate;
- sr_device_get_info(device, SR_DI_CUR_SAMPLERATE,
- (const void **) &samplerate);
- limit_samples = (*samplerate) * time_msec / (uint64_t) 1000;
+ sr_dev_get_info(device, SR_DI_CUR_SAMPLERATE,
+ (const void **)&samplerate);
+ limit_samples = (*samplerate) * time_msec / (uint64_t)1000;
}
if (limit_samples == 0) {
printf("Not enough time at this samplerate.\n");
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;
}