char **pdtokens, **pdtok, *pd_name;
/* Avoid compiler warnings. */
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");
pd_name = g_strdup(g_hash_table_lookup(pd_opthash, "sigrok_key"));
g_hash_table_remove(pd_opthash, "sigrok_key");
/* 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. */
/* 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 (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",
- 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",
printf("Cannot stack protocol decoder '%s': instance not found.\n", pds[0]);
return 1;
}
for (i = 1; pds[i]; i++) {
printf("Cannot stack protocol decoder '%s': instance not found.\n", pds[0]);
return 1;
}
for (i = 1; pds[i]; i++) {
return ret;
/* Don't show annotation from this PD. Only the last PD in
* the stack will be left on the annotation list.
*/
return ret;
/* Don't show annotation from this PD. Only the last PD in
* the stack will be left on the annotation list.
*/