X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=sigrok-cli.c;h=15bad14f7f16d865e1589aa2ff22b178c7173223;hb=f84f2fe0f99a5dfe3043589252d1069c7cdf5e5d;hp=860c2ef9fc15db8f20cd46f3a84d37d258428ea1;hpb=9c9c1080ba34648ee1029978e07d6391ca8b5cbd;p=sigrok-cli.git diff --git a/sigrok-cli.c b/sigrok-cli.c index 860c2ef..15bad14 100644 --- a/sigrok-cli.c +++ b/sigrok-cli.c @@ -387,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); @@ -397,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; } @@ -998,8 +993,8 @@ int main(int argc, char **argv) } /* 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; }