srd_exit();
}
-static void print_device_line(struct sr_device *device)
+static void print_device_line(const struct sr_device *device)
{
- struct sr_device_instance *sdi;
+ const struct sr_device_instance *sdi;
- sdi = device->plugin->get_device_info(device->plugin_index, SR_DI_INSTANCE);
+ sr_device_get_info(device, SR_DI_INSTANCE, (const void **) &sdi);
if (sdi->vendor && sdi->vendor[0])
printf("%s ", sdi->vendor);
{
struct sr_device *device;
struct sr_hwcap_option *hwo;
- struct sr_samplerates *samplerates;
+ const struct sr_samplerates *samplerates;
int cap, *capabilities, i;
- char *s, *title, *charopts, **stropts;
+ char *s, *title;
+ const char *charopts, **stropts;
device = parse_devicestring(opt_device);
if (!device) {
print_device_line(device);
- if ((charopts = (char *)device->plugin->get_device_info(
- device->plugin_index, SR_DI_TRIGGER_TYPES))) {
+ if (sr_device_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);
- stropts = (char **)device->plugin->get_device_info(
- device->plugin_index, SR_DI_PATTERNMODES);
- if (!stropts) {
+ if (sr_device_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 {
printf("\n");
- continue;
}
- 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 */
- samplerates = device->plugin->get_device_info(
- device->plugin_index, SR_DI_SAMPLERATES);
- if (!samplerates) {
+ if (sr_device_get_info(device, SR_DI_SAMPLERATES,
+ (const void **) &samplerates) != SR_OK) {
printf("\n");
continue;
}
o = NULL;
break;
case SR_DF_TRIGGER:
- g_message("cli: received SR_DF_TRIGGER at %"PRIu64" ms",
- packet->timeoffset / 1000000);
+ g_message("cli: received SR_DF_TRIGGER");
if (o->format->event)
o->format->event(o, SR_DF_TRIGGER, &output_buf,
&output_len);
case SR_DF_LOGIC:
logic = packet->payload;
sample_size = logic->unitsize;
- g_message("cli: received SR_DF_LOGIC at %f ms duration %f ms, %"PRIu64" bytes",
- packet->timeoffset / 1000000.0, packet->duration / 1000000.0,
- logic->length);
+ g_message("cli: received SR_DF_LOGIC, %"PRIu64" bytes", logic->length);
break;
case SR_DF_ANALOG:
break;
*/
static int register_pds(struct sr_device *device, const char *pdstring)
{
- GHashTable *pd;
+ GHashTable *pd_opthash;
struct srd_decoder_instance *di;
char **pdtokens, **pdtok, *pd_name;
g_datalist_init(&pd_ann_visible);
pdtokens = g_strsplit(pdstring, ",", -1);
- pd = NULL;
+ pd_opthash = NULL;
pd_name = NULL;
for (pdtok = pdtokens; *pdtok; pdtok++) {
- if (!(pd = parse_generic_arg(*pdtok))) {
+ if (!(pd_opthash = parse_generic_arg(*pdtok))) {
fprintf(stderr, "Invalid protocol decoder option '%s'.\n", *pdtok);
goto err_out;
}
- 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))) {
+ 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))) {
fprintf(stderr, "Failed to instantiate PD %s\n", pd_name);
goto err_out;
}
- g_datalist_set_data(&pd_ann_visible, pd_name, pd_name);
- }
+ g_datalist_set_data(&pd_ann_visible, di->instance_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) != SRD_OK)
- return 1;
+ /* 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)
+ goto err_out;
+ g_hash_table_destroy(pd_opthash);
+ pd_opthash = NULL;
+ }
err_out:
g_strfreev(pdtokens);
- if (pd)
- g_hash_table_destroy(pd);
+ if (pd_opthash)
+ g_hash_table_destroy(pd_opthash);
if (pd_name)
g_free(pd_name);
int i;
char **annotations;
- annotations = pdata->data;
if (pdata->ann_format != 0) {
- /* CLI only shows the default annotation format */
+ /* CLI only shows the default annotation format. */
return;
}
- if (!g_datalist_get_data(&pd_ann_visible, pdata->pdo->proto_id)) {
- /* not in the list of PDs whose annotations we're showing */
+ if (!g_datalist_get_data(&pd_ann_visible, pdata->pdo->di->instance_id)) {
+ /* Not in the list of PDs whose annotations we're showing. */
return;
}
+ annotations = pdata->data;
if (opt_loglevel > SR_LOG_WARN)
printf("%"PRIu64"-%"PRIu64" ", pdata->start_sample, pdata->end_sample);
printf("%s: ", pdata->pdo->proto_id);
struct sr_device *device;
GHashTable *devargs;
int num_devices, max_probes, *capabilities, i;
- uint64_t tmp_u64, time_msec;
+ uint64_t time_msec;
char **probelist, *devspec;
devargs = NULL;
*/
limit_samples = 0;
if (sr_device_has_hwcap(device, SR_HWCAP_SAMPLERATE)) {
- tmp_u64 = *((uint64_t *) device->plugin->get_device_info(
- device->plugin_index, SR_DI_CUR_SAMPLERATE));
- limit_samples = tmp_u64 * time_msec / (uint64_t) 1000;
+ const uint64_t *samplerate;
+
+ sr_device_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 (!(di_from = srd_instance_find(pds[0]))) {
+ if (!(di_from = srd_instance_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(pds[i]))) {
+ if (!(di_to = srd_instance_find_by_id(pds[i]))) {
printf("Cannot stack protocol decoder '%s': instance not found.\n", pds[i]);
return 1;
}
projects / sigrok-cli.git / blobdiff