X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=sigrok-cli.c;h=50fec3997874014b395f262e3f5a822342c13580;hp=c50d064a63a75b2142beaf1e94bb18b4fdc90779;hb=bed505259f5027000028d5ee69a93f1b6231eb6d;hpb=3c9c82c0c6a5eaaa14f4915d09fc65e632626231 diff --git a/sigrok-cli.c b/sigrok-cli.c index c50d064..50fec39 100644 --- a/sigrok-cli.c +++ b/sigrok-cli.c @@ -126,11 +126,11 @@ static void show_version(void) 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); @@ -176,9 +176,10 @@ static void show_device_detail(void) { 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) { @@ -188,8 +189,8 @@ static void show_device_detail(void) 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); @@ -211,21 +212,19 @@ static void show_device_detail(void) 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; } @@ -388,8 +387,7 @@ static void datafeed_in(struct sr_device *device, struct sr_datafeed_packet *pac 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); @@ -398,11 +396,7 @@ static void datafeed_in(struct sr_device *device, struct sr_datafeed_packet *pac 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); - break; - case SR_DF_ANALOG: + g_message("cli: received SR_DF_LOGIC, %"PRIu64" bytes", logic->length); break; } @@ -470,7 +464,7 @@ cleanup: */ 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; @@ -479,35 +473,37 @@ static int register_pds(struct sr_device *device, const char *pdstring) 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); @@ -519,17 +515,17 @@ void show_pd_annotation(struct srd_proto_data *pdata) 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); @@ -784,7 +780,7 @@ static void run_session(void) 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; @@ -881,9 +877,11 @@ static void run_session(void) */ 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"); @@ -988,15 +986,15 @@ int main(int argc, char **argv) } /* Set the loglevel (amount of messages to output) for libsigrok. */ - if (sr_set_loglevel(opt_loglevel) != SR_OK) { - fprintf(stderr, "cli: %s: sr_set_loglevel(%d) failed\n", + if (sr_log_loglevel_set(opt_loglevel) != SR_OK) { + fprintf(stderr, "cli: %s: sr_log_loglevel_set(%d) failed\n", __func__, opt_loglevel); return 1; } /* Set the loglevel (amount of messages to output) for libsigrokdecode. */ - if (srd_set_loglevel(opt_loglevel) != SRD_OK) { - fprintf(stderr, "cli: %s: srd_set_loglevel(%d) failed\n", + if (srd_log_loglevel_set(opt_loglevel) != SRD_OK) { + fprintf(stderr, "cli: %s: srd_log_loglevel_set(%d) failed\n", __func__, opt_loglevel); return 1; } @@ -1027,12 +1025,12 @@ int main(int argc, char **argv) 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; }